* textmodes/ispell.el (ispell-skip-region-alist):

* textmodes/css-mode.el (auto-mode-alist):
* progmodes/compile.el (auto-mode-alist):
* international/mule.el (ctext-non-standard-encodings-alist)
(ctext-non-standard-encodings-regexp):
* simple.el (shell-command-switch, text-read-only):
* replace.el (occur-mode-map):
* paths.el (rmail-file-name):
* jka-cmpr-hook.el (jka-compr-build-file-regexp):
* find-file.el (ff-special-constructs):
* files.el (file-name-handler-alist):
* composite.el: Purecopy strings.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 80d816cc5178b202a8c8aeea8fcdf134a3df74e7..000d55ab89e07746e23b731492bb8fcc88e2701c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,18 @@
 2009-11-12  Dan Nicolaescu  <dann@ics.uci.edu>
 
+       * textmodes/ispell.el (ispell-skip-region-alist):
+       * textmodes/css-mode.el (auto-mode-alist):
+       * progmodes/compile.el (auto-mode-alist):
+       * international/mule.el (ctext-non-standard-encodings-alist)
+       (ctext-non-standard-encodings-regexp):
+       * simple.el (shell-command-switch, text-read-only):
+       * replace.el (occur-mode-map):
+       * paths.el (rmail-file-name):
+       * jka-cmpr-hook.el (jka-compr-build-file-regexp):
+       * find-file.el (ff-special-constructs):
+       * files.el (file-name-handler-alist):
+       * composite.el: Purecopy strings.
+
        * emacs-lisp/cl-macs.el (define-compiler-macro): Purecopy the file name.
 
 2009-11-11  Dan Nicolaescu  <dann@ics.uci.edu>

diff --git a/lisp/composite.el b/lisp/composite.el
index c9f16e2f518ab285da07b0b81858d4a1a5d96813..ce7ea95800b9cc039f6d8ca51ba110efee135239 100644 (file)
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -655,7 +655,7 @@ All non-spacing characters has this function in
              (setq i (1+ i))))
          gstring))))))
 
-(let ((elt '(["\\c.\\c^+" 1 compose-gstring-for-graphic]
+(let ((elt `([,(purecopy "\\c.\\c^+") 1 compose-gstring-for-graphic]
             [nil 0 compose-gstring-for-graphic])))
   (map-char-table
    #'(lambda (key val)

diff --git a/lisp/files.el b/lisp/files.el
index 328239b5e375c9eacd36a47df25a8fded8823604..3fc64600786389c5832d26f0af68947ce2c97535 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5945,7 +5945,7 @@ only these files will be asked to be saved."
 ;; so that magic file name handlers will not apply to it.
 
 (setq file-name-handler-alist
-      (cons '("\\`/:" . file-name-non-special)
+      (cons (cons (purecopy "\\`/:") 'file-name-non-special)
            file-name-handler-alist))
 
 ;; We depend on being the last handler on the list,

diff --git a/lisp/find-file.el b/lisp/find-file.el
index d4e335def7019a597aff73c4b4c1f58d7bede0f5..8042cfb2a4a0934f75ea435ffd4d4ef2b3155e3f 100644 (file)
--- a/lisp/find-file.el
+++ b/lisp/find-file.el
@@ -183,9 +183,9 @@ To override this, give an argument to `ff-find-other-file'."
 
 ;;;###autoload
 (defvar ff-special-constructs
-  '(
+  `(
     ;; C/C++ include, for NeXTSTEP too
-    ("^\#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]" .
+    (,(purecopy "^\#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]") .
      (lambda ()
        (buffer-substring (match-beginning 2) (match-end 2))))
     )

diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index c4e8f06f5e024d810653de53d8b5177c5095e141..7ccec501c7d6e5dc969239de87730437c949e35d 100644 (file)
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1404,10 +1404,11 @@ This function is provided for backward compatibility."
 ;;; X selections
 
 (defvar ctext-non-standard-encodings-alist
+  (mapcar 'purecopy
   '(("big5-0" big5 2 big5)
     ("ISO8859-14" iso-8859-14 1 latin-iso8859-14)
     ("ISO8859-15" iso-8859-15 1 latin-iso8859-15)
-    ("gbk-0" gbk 2 chinese-gbk))
+    ("gbk-0" gbk 2 chinese-gbk)))
   "Alist of non-standard encoding names vs the corresponding usages in CTEXT.
 
 It controls how extended segments of a compound text are handled
@@ -1440,13 +1441,14 @@ Each element must be one of the names listed in the variable
 `ctext-non-standard-encodings-alist' (which see).")
 
 (defvar ctext-non-standard-encodings-regexp
+  (purecopy
   (string-to-multibyte
    (concat
     ;; For non-standard encodings.
     "\\(\e%/[0-4][\200-\377][\200-\377]\\([^\002]+\\)\002\\)"
     "\\|"
     ;; For UTF-8 encoding.
-    "\\(\e%G[^\e]*\e%@\\)")))
+    "\\(\e%G[^\e]*\e%@\\)"))))
 
 ;; Functions to support "Non-Standard Character Set Encodings" defined
 ;; by the COMPOUND-TEXT spec.  They also support "The UTF-8 encoding"

diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el
index fab5c6ba92578c8b732e3ad4411dc63af6ed7729..6697d241987ab89f6c82fce5f30759afb869db32 100644 (file)
--- a/lisp/jka-cmpr-hook.el
+++ b/lisp/jka-cmpr-hook.el
@@ -71,10 +71,11 @@ Otherwise, it is nil.")
 
 \f
 (defun jka-compr-build-file-regexp ()
+  (purecopy
   (mapconcat
    'jka-compr-info-regexp
    jka-compr-compression-info-list
-   "\\|"))
+   "\\|")))
 
 ;; Functions for accessing the return value of jka-compr-get-compression-info
 (defun jka-compr-info-regexp               (info)  (aref info 0))

diff --git a/lisp/paths.el b/lisp/paths.el
index 7af0136a478a41eae2a05f9308c5245647e5f54c..ac072ac7b01e68ac8962c1ae1772c5b5180ca221 100644 (file)
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -132,7 +132,7 @@ should be set to `(system-name)'.")
 *The name of your organization, as a string.
 The `ORGANIZATION' environment variable is used instead if defined.")
 
-(defcustom rmail-file-name "~/RMAIL" "\
+(defcustom rmail-file-name (purecopy "~/RMAIL") "\
 Name of user's primary mail file."
   :type 'string
   :group 'rmail

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index f101fe65064a715a38c8fe6f02dd0e3e30950604..cb2b8986f22332371030dda697c025bfe3c2083a 100644 (file)
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -2377,7 +2377,7 @@ The file-structure looks like this:
           (eq compilation-scroll-output 'first-error))))
 
 ;;;###autoload
-(add-to-list 'auto-mode-alist '("\\.gcov\\'" . compilation-mode))
+(add-to-list 'auto-mode-alist (cons (purecopy "\\.gcov\\'") 'compilation-mode))
 
 (provide 'compile)
 

diff --git a/lisp/replace.el b/lisp/replace.el
index b4b614534d9dfed2f8a92076b7a7c910bf4de96e..7e14895d1e61259ea73302e8066c7bfdca183d76 100644 (file)
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -773,7 +773,7 @@ a previously found match."
       (menu-bar-make-mm-toggle next-error-follow-minor-mode
                               "Auto Occurrence Display"
                               "Display another occurrence when moving the cursor"))
-    (define-key map [separator-1] '("--"))
+    (define-key map [separator-1] menu-bar-separator)
     (define-key map [kill-this-buffer]
       `(menu-item ,(purecopy "Kill occur buffer") kill-this-buffer
                  :help ,(purecopy "Kill the current *Occur* buffer")))

diff --git a/lisp/simple.el b/lisp/simple.el
index 00693b3bb56a46934efd226c21be9539dbbefd93..73c7ac7579f61fe0600fd0e32892e1c386cc2eeb 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2003,7 +2003,7 @@ which is defined in the `warnings' library.\n")
 Maximum length of the history list is determined by the value
 of `history-length', which see.")
 
-(defvar shell-command-switch "-c"
+(defvar shell-command-switch (purecopy "-c")
   "Switch used to have the shell execute its command line argument.")
 
 (defvar shell-command-default-error-buffer nil
@@ -2945,7 +2945,7 @@ move the yanking point; just return the Nth kill forward."
 
 (put 'text-read-only 'error-conditions
      '(text-read-only buffer-read-only error))
-(put 'text-read-only 'error-message "Text is read-only")
+(put 'text-read-only 'error-message (purecopy "Text is read-only"))
 
 (defun kill-region (beg end &optional yank-handler)
   "Kill (\"cut\") text between point and mark.

diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 70dc3ca57060ec6f9ee33e3a97b8a07c234725e0..58a7766f2a3e64f6a041cf92054889e82db2b9c4 100644 (file)
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -257,7 +257,7 @@
 (defvar css-font-lock-defaults
   '(css-font-lock-keywords nil t))
 
-;;;###autoload (add-to-list 'auto-mode-alist '("\\.css\\'" . css-mode))
+;;;###autoload (add-to-list 'auto-mode-alist (cons (purecopy "\\.css\\'") 'css-mode))
 ;;;###autoload
 (define-derived-mode css-mode fundamental-mode "CSS"
   "Major mode to edit Cascading Style Sheets."

diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 75cc8e0de47330b4ce7d6c7848b89e43bd55eda4..f8fd0685be1bddd61c3fb067f20f70c9dd27e435 100644 (file)
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1406,7 +1406,7 @@ The last occurring definition in the buffer will be used.")
     ;; Matches e-mail addresses, file names, http addresses, etc.  The
     ;; `-+' `_+' patterns are necessary for performance reasons when
     ;; `-' or `_' part of word syntax.
-    ("\\(--+\\|_+\\|\\(/\\w\\|\\(\\(\\w\\|[-_]\\)+[.:@]\\)\\)\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_~=?&]\\)+\\)+\\)")
+    (,(purecopy "\\(--+\\|_+\\|\\(/\\w\\|\\(\\(\\w\\|[-_]\\)+[.:@]\\)\\)\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_~=?&]\\)+\\)+\\)"))
     ;; above checks /.\w sequences
     ;;("\\(--+\\|\\(/\\|\\(\\(\\w\\|[-_]\\)+[.:@]\\)\\)\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_~=?&]\\)+\\)+\\)")
     ;; This is a pretty complex regexp.  It can be simplified to the following: