# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1254011241 0
# Node ID fb7e59394e9b5850f4a819b241d3f48edd2cbec1
# Parent  48313e2e9ae303aafad69b433ed6773cd4ea40ff
* 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.

diff -r 48313e2e9ae3 -r fb7e59394e9b lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Sep 26 20:02:42 2009 +0000
+++ b/lisp/ChangeLog	Sun Sep 27 00:27:21 2009 +0000
@@ -1,3 +1,10 @@
+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>
 
 	* mail/rmailmm.el (rmail-mime-show-images, rmail-mime-bulk-handler):
diff -r 48313e2e9ae3 -r fb7e59394e9b lisp/help-macro.el
--- a/lisp/help-macro.el	Sat Sep 26 20:02:42 2009 +0000
+++ b/lisp/help-macro.el	Sun Sep 27 00:27:21 2009 +0000
@@ -90,7 +90,7 @@
 and then returns."
   (let ((doc-fn (intern (concat (symbol-name fname) "-doc"))))
     `(progn
-       (defun ,doc-fn () ,help-text)
+       (defun ,doc-fn () ,help-text nil)
        (defun ,fname ()
 	 "Help command."
 	 (interactive)
diff -r 48313e2e9ae3 -r fb7e59394e9b lisp/help.el
--- a/lisp/help.el	Sat Sep 26 20:02:42 2009 +0000
+++ b/lisp/help.el	Sun Sep 27 00:27:21 2009 +0000
@@ -203,7 +203,9 @@
 ;; It can't find this, but nobody will look.
 (make-help-screen help-for-help-internal
   (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:
 \(Use SPC or DEL to scroll through this text.  Type \\<help-map>\\[help-quit] to exit the Help command.)
 
@@ -248,7 +250,7 @@
 C-o         Emacs ordering and distribution information.
 C-p         Info about known Emacs problems.
 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)
 
 
diff -r 48313e2e9ae3 -r fb7e59394e9b lisp/isearch.el
--- a/lisp/isearch.el	Sat Sep 26 20:02:42 2009 +0000
+++ b/lisp/isearch.el	Sun Sep 27 00:27:21 2009 +0000
@@ -347,7 +347,7 @@
 (eval-when-compile (require 'help-macro))
 
 (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:
 \(Type \\<help-map>\\[help-quit] to exit the Help command.)