* bindings.el (mode-line-mode-menu): Add purecopy calls for :help.

* help.el (help-for-help-internal): Add purecopy calls for text.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7e355d40e53cdd438bfb58592960d57f48d3dbc8..685c0cde955c5fc6b0ad9f9cdef65bd0cdeacc2b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,10 @@
 2009-09-14  Dan Nicolaescu  <dann@ics.uci.edu>
 
+       * bindings.el (mode-line-mode-menu): Add purecopy calls for :help.
+       * help.el (help-for-help-internal): Add purecopy calls for text.
+
        * vc.el (top): print-log method now takes an optional SHORTLOG
        argument.  Add a new method: root.
-
        (vc-root-diff, vc-print-root-log): New functions.
        (vc-log-short-style): New variable.
        (vc-print-log-internal): Add support for showing short logs.

diff --git a/lisp/bindings.el b/lisp/bindings.el
index 9924af8cb07968fde2fc40d766c10cfe04386fc9..139a4853918e2d8929dde657a23d4e16c409c781 100644 (file)
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -507,49 +507,49 @@ Switch to the most recently selected buffer other than the current one."
 ;; Global ones can go on the menubar (Options --> Show/Hide).
 (define-key mode-line-mode-menu [overwrite-mode]
   `(menu-item ,(purecopy "Overwrite (Ovwrt)") overwrite-mode
-             :help "Overwrite mode: typed characters replace existing text"
+             :help ,(purecopy "Overwrite mode: typed characters replace existing text")
              :button (:toggle . overwrite-mode)))
 (define-key mode-line-mode-menu [outline-minor-mode]
   `(menu-item ,(purecopy "Outline (Outl)") outline-minor-mode
              ;; XXX: This needs a good, brief description.
-             :help ""
+             :help ,(purecopy "")
              :button (:toggle . (bound-and-true-p outline-minor-mode))))
 (define-key mode-line-mode-menu [highlight-changes-mode]
   `(menu-item ,(purecopy "Highlight changes (Chg)") highlight-changes-mode
-             :help "Show changes in the buffer in a distinctive color"
+             :help ,(purecopy "Show changes in the buffer in a distinctive color")
              :button (:toggle . (bound-and-true-p highlight-changes-mode))))
 (define-key mode-line-mode-menu [hide-ifdef-mode]
   `(menu-item ,(purecopy "Hide ifdef (Ifdef)") hide-ifdef-mode
-             :help "Show/Hide code within #ifdef constructs"
+             :help ,(purecopy "Show/Hide code within #ifdef constructs")
              :button (:toggle . (bound-and-true-p hide-ifdef-mode))))
 (define-key mode-line-mode-menu [glasses-mode]
   `(menu-item ,(purecopy "Glasses (o^o)") glasses-mode
-             :help "Insert virtual separators to make long identifiers easy to read"
+             :help ,(purecopy "Insert virtual separators to make long identifiers easy to read")
              :button (:toggle . (bound-and-true-p glasses-mode))))
 (define-key mode-line-mode-menu [font-lock-mode]
   `(menu-item ,(purecopy "Font Lock") font-lock-mode
-             :help "Syntax coloring"
+             :help ,(purecopy "Syntax coloring")
              :button (:toggle . font-lock-mode)))
 (define-key mode-line-mode-menu [flyspell-mode]
   `(menu-item ,(purecopy "Flyspell (Fly)") flyspell-mode
-             :help "Spell checking on the fly"
+             :help ,(purecopy "Spell checking on the fly")
              :button (:toggle . (bound-and-true-p flyspell-mode))))
 (define-key mode-line-mode-menu [auto-revert-tail-mode]
   `(menu-item ,(purecopy "Auto revert tail (Tail)") auto-revert-tail-mode
-             :help "Revert the tail of the buffer when buffer grows"
+             :help ,(purecopy "Revert the tail of the buffer when buffer grows")
              :enable (buffer-file-name)
              :button (:toggle . (bound-and-true-p auto-revert-tail-mode))))
 (define-key mode-line-mode-menu [auto-revert-mode]
   `(menu-item ,(purecopy "Auto revert (ARev)") auto-revert-mode
-             :help "Revert the buffer when the file on disk changes"
+             :help ,(purecopy "Revert the buffer when the file on disk changes")
              :button (:toggle . (bound-and-true-p auto-revert-mode))))
 (define-key mode-line-mode-menu [auto-fill-mode]
   `(menu-item ,(purecopy "Auto fill (Fill)") auto-fill-mode
-             :help "Automatically insert new lines"
+             :help ,(purecopy "Automatically insert new lines")
              :button (:toggle . auto-fill-function)))
 (define-key mode-line-mode-menu [abbrev-mode]
   `(menu-item ,(purecopy "Abbrev (Abbrev)") abbrev-mode
-             :help "Automatically expand abbreviations"
+             :help ,(purecopy "Automatically expand abbreviations")
              :button (:toggle . abbrev-mode)))
 
 (defun mode-line-minor-mode-help (event)

diff --git a/lisp/help.el b/lisp/help.el
index e5c07e82439580cf6be730ee42c77f1ffdf7ec05..25703fba9209c52889481ca33a9132ea0ce6032a 100644 (file)
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -202,7 +202,8 @@ specifies what to do when the user exits the help buffer."
 (defalias 'help-for-help 'help-for-help-internal)
 ;; It can't find this, but nobody will look.
 (make-help-screen help-for-help-internal
-  "Type a help option: [abcCdefFgiIkKlLmnprstvw.] C-[cdefmnoptw] or ?"
+  (purecopy "Type a help option: [abcCdefFgiIkKlLmnprstvw.] C-[cdefmnoptw] or ?")
+  (purecopy
   "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.)
 
@@ -247,7 +248,7 @@ C-n         News of recent Emacs changes.
 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)
 
 \f