[Emacs-diffs] /srv/bzr/emacs/trunk r102206: Silence compilation of mm-util.el.

[Glenn Morris]

------------------------------------------------------------
revno: 102206
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2010-10-31 23:39:01 -0700
message:
  Silence compilation of mm-util.el.
  * lisp/gnus/mm-util.el (gnus-completing-read): Autoload.
  (mm-read-coding-system): Simplify Emacs definition.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/mm-util.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-11-01 06:21:44 +0000
+++ b/lisp/gnus/ChangeLog       2010-11-01 06:39:01 +0000
@@ -5,6 +5,9 @@
 
 2010-11-01  Glenn Morris  <address@hidden>
 
+       * mm-util.el (gnus-completing-read): Autoload.
+       (mm-read-coding-system): Simplify Emacs definition.
+
        * nnmail.el (gnus-activate-group):
        * nnimap.el (gnutls-negotiate):
        * nntp.el (netrc-parse): Fix declarations.

=== modified file 'lisp/gnus/mm-util.el'
--- a/lisp/gnus/mm-util.el      2010-11-01 02:21:42 +0000
+++ b/lisp/gnus/mm-util.el      2010-11-01 06:39:01 +0000
@@ -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 @@
 ;; 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 ()