mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
* 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.
This commit is contained in:
parent
76410c3e21
commit
6d341a2a09
12 changed files with 30 additions and 14 deletions
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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))))
|
||||
)
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -71,10 +71,11 @@ Otherwise, it is nil.")
|
|||
|
||||
|
||||
(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))
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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")))
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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."
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue