[Emacs-diffs] emacs/lisp ChangeLog composite.el files.el find...

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/11/12 06:55:44

Modified files:
        lisp           : ChangeLog composite.el files.el find-file.el 
                         jka-cmpr-hook.el paths.el replace.el simple.el 
        lisp/international: mule.el 
        lisp/progmodes : compile.el 
        lisp/textmodes : css-mode.el ispell.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16607&r2=1.16608
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/composite.el?cvsroot=emacs&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/files.el?cvsroot=emacs&r1=1.1099&r2=1.1100
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/find-file.el?cvsroot=emacs&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/jka-cmpr-hook.el?cvsroot=emacs&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/paths.el?cvsroot=emacs&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/replace.el?cvsroot=emacs&r1=1.286&r2=1.287
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/simple.el?cvsroot=emacs&r1=1.1024&r2=1.1025
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/international/mule.el?cvsroot=emacs&r1=1.292&r2=1.293
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/compile.el?cvsroot=emacs&r1=1.503&r2=1.504
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/textmodes/css-mode.el?cvsroot=emacs&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/textmodes/ispell.el?cvsroot=emacs&r1=1.263&r2=1.264

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16607
retrieving revision 1.16608
diff -u -b -r1.16607 -r1.16608
--- ChangeLog   12 Nov 2009 06:48:03 -0000      1.16607
+++ ChangeLog   12 Nov 2009 06:55:39 -0000      1.16608
@@ -1,5 +1,18 @@
 2009-11-12  Dan Nicolaescu  <address@hidden>
 
+       * 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  <address@hidden>

Index: composite.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/composite.el,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- composite.el        13 Sep 2009 00:52:59 -0000      1.49
+++ composite.el        12 Nov 2009 06:55:42 -0000      1.50
@@ -655,7 +655,7 @@
              (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)

Index: files.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/files.el,v
retrieving revision 1.1099
retrieving revision 1.1100
diff -u -b -r1.1099 -r1.1100
--- files.el    11 Nov 2009 19:02:35 -0000      1.1099
+++ files.el    12 Nov 2009 06:55:42 -0000      1.1100
@@ -5945,7 +5945,7 @@
 ;; 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,

Index: find-file.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/find-file.el,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- find-file.el        5 Jan 2009 03:19:10 -0000       1.40
+++ find-file.el        12 Nov 2009 06:55:43 -0000      1.41
@@ -183,9 +183,9 @@
 
 ;;;###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))))
     )

Index: jka-cmpr-hook.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/jka-cmpr-hook.el,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- jka-cmpr-hook.el    6 Nov 2009 05:16:28 -0000       1.29
+++ jka-cmpr-hook.el    12 Nov 2009 06:55:43 -0000      1.30
@@ -71,10 +71,11 @@
 
 
 (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))

Index: paths.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/paths.el,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- paths.el    6 Nov 2009 05:16:28 -0000       1.89
+++ paths.el    12 Nov 2009 06:55:43 -0000      1.90
@@ -132,7 +132,7 @@
 *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

Index: replace.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/replace.el,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -b -r1.286 -r1.287
--- replace.el  11 Nov 2009 05:57:54 -0000      1.286
+++ replace.el  12 Nov 2009 06:55:43 -0000      1.287
@@ -773,7 +773,7 @@
       (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")))

Index: simple.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/simple.el,v
retrieving revision 1.1024
retrieving revision 1.1025
diff -u -b -r1.1024 -r1.1025
--- simple.el   11 Nov 2009 05:49:13 -0000      1.1024
+++ simple.el   12 Nov 2009 06:55:43 -0000      1.1025
@@ -2003,7 +2003,7 @@
 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 @@
 
 (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.

Index: international/mule.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/international/mule.el,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -b -r1.292 -r1.293
--- international/mule.el       11 Nov 2009 06:27:29 -0000      1.292
+++ international/mule.el       12 Nov 2009 06:55:43 -0000      1.293
@@ -1404,10 +1404,11 @@
 ;;; 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 @@
 `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.
-    "\\(address@hidden)")))
+    "\\(address@hidden)"))))
 
 ;; Functions to support "Non-Standard Character Set Encodings" defined
 ;; by the COMPOUND-TEXT spec.  They also support "The UTF-8 encoding"

Index: progmodes/compile.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/compile.el,v
retrieving revision 1.503
retrieving revision 1.504
diff -u -b -r1.503 -r1.504
--- progmodes/compile.el        11 Nov 2009 19:24:24 -0000      1.503
+++ progmodes/compile.el        12 Nov 2009 06:55:43 -0000      1.504
@@ -2377,7 +2377,7 @@
           (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)
 

Index: textmodes/css-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/textmodes/css-mode.el,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- textmodes/css-mode.el       18 Jan 2009 22:32:24 -0000      1.13
+++ textmodes/css-mode.el       12 Nov 2009 06:55:44 -0000      1.14
@@ -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."

Index: textmodes/ispell.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/textmodes/ispell.el,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -b -r1.263 -r1.264
--- textmodes/ispell.el 6 Nov 2009 05:16:30 -0000       1.263
+++ textmodes/ispell.el 12 Nov 2009 06:55:44 -0000      1.264
@@ -1406,7 +1406,7 @@
     ;; 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: