diff options
| author | Stefan Monnier | 2009-09-27 00:27:21 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2009-09-27 00:27:21 +0000 |
| commit | ce9a0ccb72711855dfd994d0500c01e4417d09d5 (patch) | |
| tree | 8839de8cf90d6bb6b8b2b326b0746fcc6bb5ed70 /lisp/help.el | |
| parent | 607b83077fbf53cfc8b44f4341b0e937ac601a82 (diff) | |
| download | emacs-ce9a0ccb72711855dfd994d0500c01e4417d09d5.tar.gz emacs-ce9a0ccb72711855dfd994d0500c01e4417d09d5.zip | |
* 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.
Diffstat (limited to 'lisp/help.el')
| -rw-r--r-- | lisp/help.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/help.el b/lisp/help.el index 25703fba920..8b5efc88d8d 100644 --- a/lisp/help.el +++ b/lisp/help.el | |||
| @@ -203,7 +203,9 @@ specifies what to do when the user exits the help buffer." | |||
| 203 | ;; It can't find this, but nobody will look. | 203 | ;; It can't find this, but nobody will look. |
| 204 | (make-help-screen help-for-help-internal | 204 | (make-help-screen help-for-help-internal |
| 205 | (purecopy "Type a help option: [abcCdefFgiIkKlLmnprstvw.] C-[cdefmnoptw] or ?") | 205 | (purecopy "Type a help option: [abcCdefFgiIkKlLmnprstvw.] C-[cdefmnoptw] or ?") |
| 206 | (purecopy | 206 | ;; Don't purecopy this one, because it's not evaluated (it's |
| 207 | ;; directly used as a docstring in a function definition, so it'll | ||
| 208 | ;; be moved to the DOC file anyway: no need for purecopying it). | ||
| 207 | "You have typed %THIS-KEY%, the help character. Type a Help option: | 209 | "You have typed %THIS-KEY%, the help character. Type a Help option: |
| 208 | \(Use SPC or DEL to scroll through this text. Type \\<help-map>\\[help-quit] to exit the Help command.) | 210 | \(Use SPC or DEL to scroll through this text. Type \\<help-map>\\[help-quit] to exit the Help command.) |
| 209 | 211 | ||
| @@ -248,7 +250,7 @@ C-n News of recent Emacs changes. | |||
| 248 | C-o Emacs ordering and distribution information. | 250 | C-o Emacs ordering and distribution information. |
| 249 | C-p Info about known Emacs problems. | 251 | C-p Info about known Emacs problems. |
| 250 | C-t Emacs TODO list. | 252 | C-t Emacs TODO list. |
| 251 | C-w Information on absence of warranty for GNU Emacs.") | 253 | C-w Information on absence of warranty for GNU Emacs." |
| 252 | help-map) | 254 | help-map) |
| 253 | 255 | ||
| 254 | 256 | ||