diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-10-03 09:15:04 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-10-03 09:15:04 -0700 |
| commit | 05e153a645e17fd83f673ed6b243dae00feff647 (patch) | |
| tree | 1df03801951fd99b669b0421fa47307b6f956486 | |
| parent | 96ef9ccd1b0a28c774ad5b9ffbfb811de540eb30 (diff) | |
| download | emacs-05e153a645e17fd83f673ed6b243dae00feff647.tar.gz | |
* lisp/help-macro.el (three-step-help): Revert 2012-09-29 change.
Fixes: debbugs:12567
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/help-macro.el | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1b115e5c5d5..32540b213dc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-10-03 Glenn Morris <rgm@gnu.org> + + * help-macro.el (three-step-help): + Revert 2012-09-29 change. (Bug#12567) + 2012-10-03 Martin Rudalics <rudalics@gmx.at> * menu-bar.el (kill-this-buffer): Don't do anything when diff --git a/lisp/help-macro.el b/lisp/help-macro.el index 0600484b6df..63ae02eb90d 100644 --- a/lisp/help-macro.el +++ b/lisp/help-macro.el @@ -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 |