Commit ce9a0ccb authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* help.el (help-for-help-internal): Don't purecopy the text (bug#4560).

* isearch.el (isearch-help-for-help-internal): Purecopy the second arg.
* help-macro.el (make-help-screen): Avoid using an ambiguous function
definition where the docstring could be taken for the return value.
parent 607b8307
2009-09-27 Stefan Monnier <monnier@iro.umontreal.ca>
* help.el (help-for-help-internal): Don't purecopy the text (bug#4560).
* isearch.el (isearch-help-for-help-internal): Purecopy the second arg.
* help-macro.el (make-help-screen): Avoid using an ambiguous function
definition where the docstring could be taken for the return value.
2009-09-26 Glenn Morris <rgm@gnu.org> 2009-09-26 Glenn Morris <rgm@gnu.org>
* mail/rmailmm.el (rmail-mime-show-images, rmail-mime-bulk-handler): * mail/rmailmm.el (rmail-mime-show-images, rmail-mime-bulk-handler):
......
...@@ -90,7 +90,7 @@ When FNAME finally does get a command, it executes that command ...@@ -90,7 +90,7 @@ When FNAME finally does get a command, it executes that command
and then returns." and then returns."
(let ((doc-fn (intern (concat (symbol-name fname) "-doc")))) (let ((doc-fn (intern (concat (symbol-name fname) "-doc"))))
`(progn `(progn
(defun ,doc-fn () ,help-text) (defun ,doc-fn () ,help-text nil)
(defun ,fname () (defun ,fname ()
"Help command." "Help command."
(interactive) (interactive)
......
...@@ -203,7 +203,9 @@ specifies what to do when the user exits the help buffer." ...@@ -203,7 +203,9 @@ specifies what to do when the user exits the help buffer."
;; It can't find this, but nobody will look. ;; It can't find this, but nobody will look.
(make-help-screen help-for-help-internal (make-help-screen help-for-help-internal
(purecopy "Type a help option: [abcCdefFgiIkKlLmnprstvw.] C-[cdefmnoptw] or ?") (purecopy "Type a help option: [abcCdefFgiIkKlLmnprstvw.] C-[cdefmnoptw] or ?")
(purecopy ;; Don't purecopy this one, because it's not evaluated (it's
;; directly used as a docstring in a function definition, so it'll
;; be moved to the DOC file anyway: no need for purecopying it).
"You have typed %THIS-KEY%, the help character. Type a Help option: "You have typed %THIS-KEY%, the help character. Type a Help option:
\(Use SPC or DEL to scroll through this text. Type \\<help-map>\\[help-quit] to exit the Help command.) \(Use SPC or DEL to scroll through this text. Type \\<help-map>\\[help-quit] to exit the Help command.)
...@@ -248,7 +250,7 @@ C-n News of recent Emacs changes. ...@@ -248,7 +250,7 @@ C-n News of recent Emacs changes.
C-o Emacs ordering and distribution information. C-o Emacs ordering and distribution information.
C-p Info about known Emacs problems. C-p Info about known Emacs problems.
C-t Emacs TODO list. C-t Emacs TODO list.
C-w Information on absence of warranty for GNU Emacs.") C-w Information on absence of warranty for GNU Emacs."
help-map) help-map)
......
...@@ -347,7 +347,7 @@ A value of nil means highlight all matches." ...@@ -347,7 +347,7 @@ A value of nil means highlight all matches."
(eval-when-compile (require 'help-macro)) (eval-when-compile (require 'help-macro))
(make-help-screen isearch-help-for-help-internal (make-help-screen isearch-help-for-help-internal
"Type a help option: [bkm] or ?" (purecopy "Type a help option: [bkm] or ?")
"You have typed %THIS-KEY%, the help character. Type a Help option: "You have typed %THIS-KEY%, the help character. Type a Help option:
\(Type \\<help-map>\\[help-quit] to exit the Help command.) \(Type \\<help-map>\\[help-quit] to exit the Help command.)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment