mm-util.el (gnus-completing-read): Autoload.

mm-util.el (mm-read-coding-system): Simplify Emacs definition.
nnmail.el (gnus-activate-group): Fix declarations.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e165627..0b96531 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -8,6 +8,10 @@
 
 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.
 
@@ -703,12 +707,12 @@
 
        * nnimap.el (gnutls-negotiate): Silence the byte compiler.
 
-       * gnus-art.el, gnus-cache.el, gnus-fun.el, gnus-group.el,
-       gnus-picon.el, gnus-spec.el, gnus-sum.el, gnus-util.el, gnus.el,
-       hashcash.el, imap.el, mail-source.el, message.el, mm-bodies.el,
-       mm-decode.el, mm-extern.el, mm-util.el, mm-view.el, mml-smime.el,
-       mml.el, mml1991.el, mml2015.el, nnfolder.el, nnheader.el, nnmail.el,
-       nnmaildir.el, nnrss.el, nntp.el, pgg-parse.el, pgg.el, rfc1843.el,
+       * gnus-art.el, gnus-cache.el, gnus-fun.el, gnus-group.el:
+       gnus-picon.el, gnus-spec.el, gnus-sum.el, gnus-util.el, gnus.el:
+       hashcash.el, imap.el, mail-source.el, message.el, mm-bodies.el:
+       mm-decode.el, mm-extern.el, mm-util.el, mm-view.el, mml-smime.el:
+       mml.el, mml1991.el, mml2015.el, nnfolder.el, nnheader.el, nnmail.el:
+       nnmaildir.el, nnrss.el, nntp.el, pgg-parse.el, pgg.el, rfc1843.el:
        sieve-manage.el, smime.el, spam.el: Fix comment for declare-function.
 
 2010-10-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index b06615c..67b41e0 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/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 ()

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 8ccd7b0..e5af754 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -1,7 +1,8 @@
 ;;; nnmail.el --- mail support functions for the Gnus mail backends
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007, 2008, 2009, 2010
+;;   Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news, mail
@@ -1347,7 +1348,7 @@ Eudora has a broken References line, but an OK In-Reply-To."
 ;;; Utility functions
 
 (declare-function gnus-activate-group "gnus-start"
-                  (group &optional scan dont-check method))
+                  (group &optional scan dont-check method dont-sub-check))
 
 (defun nnmail-do-request-post (accept-func &optional server)
   "Utility function to directly post a message to an nnmail-derived group.