[Emacs-diffs] emacs/lisp ChangeLog help-macro.el help.el isea...

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/09/27 00:27:26

Modified files:
        lisp           : ChangeLog help-macro.el help.el isearch.el 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16269&r2=1.16270
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/help-macro.el?cvsroot=emacs&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/help.el?cvsroot=emacs&r1=1.348&r2=1.349
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/isearch.el?cvsroot=emacs&r1=1.347&r2=1.348

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16269
retrieving revision 1.16270
diff -u -b -r1.16269 -r1.16270
--- ChangeLog   26 Sep 2009 19:20:48 -0000      1.16269
+++ ChangeLog   27 Sep 2009 00:27:21 -0000      1.16270
@@ -1,3 +1,10 @@
+2009-09-27  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * mail/rmailmm.el (rmail-mime-show-images, rmail-mime-bulk-handler):

Index: help-macro.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/help-macro.el,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- help-macro.el       5 Jan 2009 03:19:16 -0000       1.46
+++ help-macro.el       27 Sep 2009 00:27:26 -0000      1.47
@@ -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)

Index: help.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/help.el,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -b -r1.348 -r1.349
--- help.el     14 Sep 2009 23:28:43 -0000      1.348
+++ help.el     27 Sep 2009 00:27:26 -0000      1.349
@@ -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)
 
 

Index: isearch.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/isearch.el,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -b -r1.347 -r1.348
--- isearch.el  10 Sep 2009 00:54:15 -0000      1.347
+++ isearch.el  27 Sep 2009 00:27:26 -0000      1.348
@@ -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.)