[Emacs-diffs] /srv/bzr/emacs/trunk r110352: * lisp/help-macro.el (three-step-help): Revert 2012-09-29 change.

[Glenn Morris]

------------------------------------------------------------
revno: 110352
fixes bug: http://debbugs.gnu.org/12567
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-10-03 09:15:04 -0700
message:
  * lisp/help-macro.el (three-step-help): Revert 2012-09-29 change.
modified:
  lisp/ChangeLog
  lisp/help-macro.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-03 08:50:49 +0000
+++ b/lisp/ChangeLog    2012-10-03 16:15:04 +0000
@@ -1,3 +1,8 @@
+2012-10-03  Glenn Morris  <address@hidden>
+
+       * help-macro.el (three-step-help):
+       Revert 2012-09-29 change.  (Bug#12567)
+
 2012-10-03  Martin Rudalics  <address@hidden>
 
        * menu-bar.el (kill-this-buffer): Don't do anything when

=== modified file 'lisp/help-macro.el'
--- a/lisp/help-macro.el        2012-09-29 18:21:45 +0000
+++ b/lisp/help-macro.el        2012-10-03 16:15:04 +0000
@@ -69,6 +69,11 @@
 
 (require 'backquote)
 
+;; This needs to be autoloaded because it is used in the
+;; make-help-screen macro.  Using (bound-and-true-p three-step-help)
+;; is not an acceptable alternative, because nothing loads help-macro
+;; in a normal session, so any user customization would never be applied.
+;;;###autoload
 (defcustom three-step-help nil
   "Non-nil means give more info about Help command in three steps.
 The three steps are simple prompt, prompt with all options, and