Mercurial > emacs
changeset 105965:3f64b8380468
* 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.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Thu, 12 Nov 2009 06:55:39 +0000 |
| parents | bedac8edf64d |
| children | 1b85a4b6472f |
| files | lisp/ChangeLog lisp/composite.el lisp/files.el lisp/find-file.el lisp/international/mule.el lisp/jka-cmpr-hook.el lisp/paths.el lisp/progmodes/compile.el lisp/replace.el lisp/simple.el lisp/textmodes/css-mode.el lisp/textmodes/ispell.el |
| diffstat | 12 files changed, 30 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Nov 12 06:48:03 2009 +0000 +++ b/lisp/ChangeLog Thu Nov 12 06:55:39 2009 +0000 @@ -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>
--- a/lisp/composite.el Thu Nov 12 06:48:03 2009 +0000 +++ b/lisp/composite.el Thu Nov 12 06:55:39 2009 +0000 @@ -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)
--- a/lisp/files.el Thu Nov 12 06:48:03 2009 +0000 +++ b/lisp/files.el Thu Nov 12 06:55:39 2009 +0000 @@ -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,
--- a/lisp/find-file.el Thu Nov 12 06:48:03 2009 +0000 +++ b/lisp/find-file.el Thu Nov 12 06:55:39 2009 +0000 @@ -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)))) )
--- a/lisp/international/mule.el Thu Nov 12 06:48:03 2009 +0000 +++ b/lisp/international/mule.el Thu Nov 12 06:55:39 2009 +0000 @@ -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. - "\\(\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"
--- a/lisp/jka-cmpr-hook.el Thu Nov 12 06:48:03 2009 +0000 +++ b/lisp/jka-cmpr-hook.el Thu Nov 12 06:55:39 2009 +0000 @@ -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))
--- a/lisp/paths.el Thu Nov 12 06:48:03 2009 +0000 +++ b/lisp/paths.el Thu Nov 12 06:55:39 2009 +0000 @@ -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
--- a/lisp/progmodes/compile.el Thu Nov 12 06:48:03 2009 +0000 +++ b/lisp/progmodes/compile.el Thu Nov 12 06:55:39 2009 +0000 @@ -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)
--- a/lisp/replace.el Thu Nov 12 06:48:03 2009 +0000 +++ b/lisp/replace.el Thu Nov 12 06:55:39 2009 +0000 @@ -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")))
--- a/lisp/simple.el Thu Nov 12 06:48:03 2009 +0000 +++ b/lisp/simple.el Thu Nov 12 06:55:39 2009 +0000 @@ -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.
--- a/lisp/textmodes/css-mode.el Thu Nov 12 06:48:03 2009 +0000 +++ b/lisp/textmodes/css-mode.el Thu Nov 12 06:55:39 2009 +0000 @@ -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."
--- a/lisp/textmodes/ispell.el Thu Nov 12 06:48:03 2009 +0000 +++ b/lisp/textmodes/ispell.el Thu Nov 12 06:55:39 2009 +0000 @@ -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: