[Emacs-diffs] /srv/bzr/emacs/trunk r112487: gnus-art.el (gnus-article-describe-bindings): Require help-mode because of let-binding help-xref-followin (Bug#14356)

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 112487
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2013-05-07 00:28:12 +0000
message:
  gnus-art.el (gnus-article-describe-bindings): Require help-mode because of 
let-binding help-xref-followin (Bug#14356)
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-art.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-05-06 22:39:36 +0000
+++ b/lisp/gnus/ChangeLog       2013-05-07 00:28:12 +0000
@@ -1,3 +1,8 @@
+2013-05-07  Katsumi Yamaoka  <address@hidden>
+
+       * gnus-art.el (gnus-article-describe-bindings): Require help-mode
+       because of let-binding help-xref-following.  (Bug#14356)
+
 2013-05-06  Tassilo Horn  <address@hidden>
 
        * message.el (message-bury, message-send-and-exit):

=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el     2013-02-13 08:28:47 +0000
+++ b/lisp/gnus/gnus-art.el     2013-05-07 00:28:12 +0000
@@ -6629,11 +6629,7 @@
 ;;`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 @@
                    (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)))))