Mercurial > emacs

changeset 111303:488230abc7fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Silence compilation of mm-util.el. * lisp/gnus/mm-util.el (gnus-completing-read): Autoload. (mm-read-coding-system): Simplify Emacs definition.
author Glenn Morris <rgm@gnu.org>
date Sun, 31 Oct 2010 23:39:01 -0700
parents 6e8a63feb38d
children 0c36e585b866
files lisp/gnus/ChangeLog lisp/gnus/mm-util.el
diffstat 2 files changed, 20 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog	Sun Oct 31 23:21:44 2010 -0700
+++ b/lisp/gnus/ChangeLog	Sun Oct 31 23:39:01 2010 -0700
@@ -5,6 +5,9 @@
 
 2010-11-01  Glenn Morris  <rgm@gnu.org>
 
+	* 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.
--- a/lisp/gnus/mm-util.el	Sun Oct 31 23:21:44 2010 -0700
+++ b/lisp/gnus/mm-util.el	Sun Oct 31 23:39:01 2010 -0700
@@ -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 ()