gnus-art.el (gnus-article-describe-bindings): Require help-mode because of let-bindin...

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 2701a666598d997482f93ce6a0861e102240409f..6a2e83f30e0f9455eea33e202ff829fd113f185e 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-art.el (gnus-article-describe-bindings): Require help-mode
+       because of let-binding help-xref-following.  (Bug#14356)
+
 2013-05-06  Tassilo Horn  <tassilo@member.fsf.org>
 
        * message.el (message-bury, message-send-and-exit):

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 13d9b4e5c283a21561e8df297206d5799adc672e..0cf8ff05a33d0d33f6f0842a8b84c7bb098cae7b 100644 (file)
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -6629,11 +6629,7 @@ KEY is a string or a vector."
 ;;`gnus-agent-mode' in gnus-agent.el will define it.
 (defvar gnus-agent-summary-mode)
 (defvar gnus-draft-mode)
-;; Calling help-buffer will autoload help-mode.
 (defvar help-xref-stack-item)
-;; Emacs 22 doesn't load it in the batch mode.
-(eval-when-compile
-  (autoload 'help-buffer "help-mode"))
 
 (defun gnus-article-describe-bindings (&optional prefix)
   "Show a list of all defined keys, and their definitions.
@@ -6684,6 +6680,7 @@ then we display only bindings that start with that prefix."
                    (with-current-buffer ,(current-buffer)
                      (gnus-article-describe-bindings prefix)))
                  ,prefix)))
+      (require 'help-mode)
       (with-current-buffer (let (help-xref-following) (help-buffer))
        (setq help-xref-stack-item item)))))