(mml2015-use): Declare for compiler.

(message-info): Require mml2015 when appropriate.

2 files changed, 10 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 0151f681e29..5ffbcb2d1b7 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-31  Glenn Morris  <rgm@gnu.org>
+
+        * message.el (mml2015-use): Declare for compiler.
+        (message-info): Require mml2015 when appropriate.
+
 2008-03-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * nntp.el (nntp-netcat-command): Rename from nntp-via-netcat-command.
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 1ce7e461839..117ac00e5ba 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -2489,6 +2489,7 @@ Point is left at the beginning of the narrowed-to region."
 
 
 (autoload 'Info-goto-node "info")
+(defvar mml2015-use)
 
 (defun message-info (&optional arg)
   "Display the Message manual.
@@ -2497,8 +2498,11 @@ Prefixed with one \\[universal-argument], display the Emacs MIME
 manual.  With two \\[universal-argument]'s, display the EasyPG or
 PGG manual, depending on the value of `mml2015-use'."
   (interactive "p")
+  ;; Why not `info', which is in loaddefs.el?
   (Info-goto-node (format "(%s)Top"
-                          (cond ((eq arg 16) mml2015-use)
+                          (cond ((eq arg 16)
+                                 (require 'mml2015)
+                                 mml2015-use)
                                 ((eq arg  4) 'emacs-mime)
                                 ;; `booleanp' only available in Emacs 22+
                                 ((and (not (memq arg '(nil t)))