aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/help-macro.el1
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d6e7b498f4e..048966a6061 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12012-09-29 Glenn Morris <rgm@gnu.org> 12012-09-29 Glenn Morris <rgm@gnu.org>
2 2
3 * help-macro.el (three-step-help): Do not autoload defcustom.
4
3 * progmodes/inf-lisp.el (inferior-lisp-filter-regexp) 5 * progmodes/inf-lisp.el (inferior-lisp-filter-regexp)
4 (inferior-lisp-program, inferior-lisp-load-command) 6 (inferior-lisp-program, inferior-lisp-load-command)
5 (inferior-lisp-prompt, inferior-lisp-mode-hook): 7 (inferior-lisp-prompt, inferior-lisp-mode-hook):
diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index 112c72778bc..0600484b6df 100644
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -69,7 +69,6 @@
69 69
70(require 'backquote) 70(require 'backquote)
71 71
72;;;###autoload
73(defcustom three-step-help nil 72(defcustom three-step-help nil
74 "Non-nil means give more info about Help command in three steps. 73 "Non-nil means give more info about Help command in three steps.
75The three steps are simple prompt, prompt with all options, and 74The three steps are simple prompt, prompt with all options, and