diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-10-31 23:39:01 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-10-31 23:39:01 -0700 |
| commit | 4c188c5a04b550c3d865d2e197312accf227cf43 (patch) | |
| tree | 10b88d2543bfff1ec12c0b20d80c832d10317d07 /lisp/gnus/mm-util.el | |
| parent | 4f7a670aa83ab91c115c6d81ba06a6e4351e695a (diff) | |
| download | emacs-4c188c5a04b550c3d865d2e197312accf227cf43.tar.gz | |
Silence compilation of mm-util.el.
* lisp/gnus/mm-util.el (gnus-completing-read): Autoload.
(mm-read-coding-system): Simplify Emacs definition.
Diffstat (limited to 'lisp/gnus/mm-util.el')
| -rw-r--r-- | lisp/gnus/mm-util.el | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el index b06615cb61f..67b41e0cb3a 100644 --- a/lisp/gnus/mm-util.el +++ b/lisp/gnus/mm-util.el @@ -39,6 +39,10 @@ (require 'timer))) (defvar mm-mime-mule-charset-alist ) +;; Note this is not presently used on Emacs >= 23, which is good, +;; since it means standalone message-mode (which requires mml and +;; hence mml-util) does not load gnus-util. +(autoload 'gnus-completing-read "gnus-util") ;; Emulate functions that are not available in every (X)Emacs version. ;; The name of a function is prefixed with mm-, like `mm-char-int' for @@ -263,18 +267,19 @@ to the contents of the accessible portion of the buffer." ;; Actually, there should be an `mm-coding-system-mime-charset'. (eval-and-compile (defalias 'mm-read-coding-system - (cond - ((fboundp 'read-coding-system) - (if (and (featurep 'xemacs) - (<= (string-to-number emacs-version) 21.1)) - (lambda (prompt &optional default-coding-system) - (read-coding-system prompt)) - 'read-coding-system)) - (t (lambda (prompt &optional default-coding-system) - "Prompt the user for a coding system." - (gnus-completing-read - prompt (mapcar (lambda (s) (symbol-name (car s))) - mm-mime-mule-charset-alist))))))) + (if (featurep 'emacs) 'read-coding-system + (cond + ((fboundp 'read-coding-system) + (if (and (featurep 'xemacs) + (<= (string-to-number emacs-version) 21.1)) + (lambda (prompt &optional default-coding-system) + (read-coding-system prompt)) + 'read-coding-system)) + (t (lambda (prompt &optional default-coding-system) + "Prompt the user for a coding system." + (gnus-completing-read + prompt (mapcar (lambda (s) (symbol-name (car s))) + mm-mime-mule-charset-alist)))))))) (defvar mm-coding-system-list nil) (defun mm-get-coding-system-list () |