Mercurial > emacs
changeset 105798:0ad1fc06bfc8
* puresize.h (BASE_PURESIZE): Increase to 1470000.
* lread.c (Fload): Purecopy the file name when building Vpreloaded_file_list.
* textmodes/ispell.el (ispell-skip-region-alist):
* international/mule-conf.el (eight-bit):
* international/fontset.el (font-encoding-alist):
* startup.el (pure-space-overflow-message):
* simple.el (overwrite-mode-textual, overwrite-mode-binary):
* paths.el (gnus-nntp-service, rmail-spool-directory)
(term-file-prefix):
* files.el (save-some-buffers-action-alist):
* cmuscheme.el (same-window-buffer-names):
* ielm.el (same-window-buffer-names):
* shell.el (same-window-buffer-names):
* mail/sendmail.el (same-window-buffer-names):
* progmodes/inf-lisp.el (same-window-buffer-names):
* bindings.el (mode-line-client)
(mode-line-column-line-number-mode-map):
* language/tibetan.el (tibetan-precomposition-rule-regexp)
(tibetan-precomposed-regexp): Purecopy string arguments.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Fri, 30 Oct 2009 02:00:11 +0000 |
| parents | 881d56e9c3b5 |
| children | 3fe6da4a95a9 |
| files | lisp/ChangeLog lisp/bindings.el lisp/cmuscheme.el lisp/files.el lisp/ielm.el lisp/international/fontset.el lisp/international/mule-conf.el lisp/language/tibetan.el lisp/mail/sendmail.el lisp/paths.el lisp/progmodes/inf-lisp.el lisp/progmodes/python.el lisp/shell.el lisp/simple.el lisp/startup.el lisp/textmodes/ispell.el src/ChangeLog src/lread.c src/puresize.h |
| diffstat | 19 files changed, 63 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Oct 29 16:46:52 2009 +0000 +++ b/lisp/ChangeLog Fri Oct 30 02:00:11 2009 +0000 @@ -1,3 +1,23 @@ +2009-10-30 Dan Nicolaescu <dann@ics.uci.edu> + + * textmodes/ispell.el (ispell-skip-region-alist): + * international/mule-conf.el (eight-bit): + * international/fontset.el (font-encoding-alist): + * startup.el (pure-space-overflow-message): + * simple.el (overwrite-mode-textual, overwrite-mode-binary): + * paths.el (gnus-nntp-service, rmail-spool-directory) + (term-file-prefix): + * files.el (save-some-buffers-action-alist): + * cmuscheme.el (same-window-buffer-names): + * ielm.el (same-window-buffer-names): + * shell.el (same-window-buffer-names): + * mail/sendmail.el (same-window-buffer-names): + * progmodes/inf-lisp.el (same-window-buffer-names): + * bindings.el (mode-line-client) + (mode-line-column-line-number-mode-map): + * language/tibetan.el (tibetan-precomposition-rule-regexp) + (tibetan-precomposed-regexp): Purecopy string arguments. + 2009-10-28 Stefan Monnier <monnier@iro.umontreal.ca> * calc/calc.el (calc, calc-refresh, calc-trail-buffer, calc-record)
--- a/lisp/bindings.el Thu Oct 29 16:46:52 2009 +0000 +++ b/lisp/bindings.el Fri Oct 30 02:00:11 2009 +0000 @@ -151,7 +151,7 @@ (defvar mode-line-client `("" (:propertize ("" (:eval (if (frame-parameter nil 'client) "@" ""))) - help-echo "emacsclient frame")) + help-echo ,(purecopy "emacsclient frame"))) "Mode-line control for identifying emacsclient frames.") ;;;###autoload (put 'mode-line-client 'risky-local-variable t) @@ -315,11 +315,11 @@ (menu-map (make-sparse-keymap "Toggle Line and Column Number Display"))) (define-key menu-map [line-number-mode] `(menu-item ,(purecopy "Display Line Numbers") line-number-mode - :help "Toggle displaying line numbers in the mode-line" + :help ,(purecopy "Toggle displaying line numbers in the mode-line") :button (:toggle . line-number-mode))) (define-key menu-map [column-number-mode] `(menu-item ,(purecopy "Display Column Numbers") column-number-mode - :help "Toggle displaying column numbers in the mode-line" + :help ,(purecopy "Toggle displaying column numbers in the mode-line") :button (:toggle . column-number-mode))) (define-key map [mode-line down-mouse-1] menu-map) map) "\
--- a/lisp/cmuscheme.el Thu Oct 29 16:46:52 2009 +0000 +++ b/lisp/cmuscheme.el Fri Oct 30 02:00:11 2009 +0000 @@ -248,7 +248,7 @@ (setq scheme-program-name cmd) (setq scheme-buffer "*scheme*") (pop-to-buffer "*scheme*")) -;;;###autoload (add-hook 'same-window-buffer-names "*scheme*") +;;;###autoload (add-hook 'same-window-buffer-names (purecopy "*scheme*")) (defun scheme-start-file (prog) "Return the name of the start file corresponding to PROG.
--- a/lisp/files.el Thu Oct 29 16:46:52 2009 +0000 +++ b/lisp/files.el Fri Oct 30 02:00:11 2009 +0000 @@ -4400,7 +4400,7 @@ (recursive-edit)) ;; Return nil to ask about BUF again. nil) - "view this buffer") + ,(purecopy "view this buffer")) (?d ,(lambda (buf) (if (null (buffer-file-name buf)) (message "Not applicable: no file") @@ -4413,7 +4413,7 @@ (recursive-edit))) ;; Return nil to ask about BUF again. nil) - "view changes in this buffer")) + ,(purecopy "view changes in this buffer"))) "ACTION-ALIST argument used in call to `map-y-or-n-p'.") (put 'save-some-buffers-action-alist 'risky-local-variable t)
--- a/lisp/ielm.el Thu Oct 29 16:46:52 2009 +0000 +++ b/lisp/ielm.el Fri Oct 30 02:00:11 2009 +0000 @@ -541,7 +541,7 @@ ;;; User command -;;;###autoload (add-hook 'same-window-buffer-names "*ielm*") +;;;###autoload (add-hook 'same-window-buffer-names (purecopy "*ielm*")) ;;;###autoload (defun ielm nil
--- a/lisp/international/fontset.el Thu Oct 29 16:46:52 2009 +0000 +++ b/lisp/international/fontset.el Fri Oct 30 02:00:11 2009 +0000 @@ -34,6 +34,8 @@ ;; Setup font-encoding-alist for all known encodings. (setq font-encoding-alist + (mapcar (lambda (arg) + (cons (purecopy (car arg)) (cdr arg))) '(("iso8859-1$" . iso-8859-1) ("iso8859-2$" . iso-8859-2) ("iso8859-3$" . iso-8859-3) @@ -116,7 +118,7 @@ ("mulelao-1" . mule-lao) ("muletibetan-2" . tibetan) ("muletibetan-0" . tibetan) - ("muletibetan-1" . tibetan-1-column))) + ("muletibetan-1" . tibetan-1-column)))) (defvar font-encoding-charset-alist)
--- a/lisp/international/mule-conf.el Thu Oct 29 16:46:52 2009 +0000 +++ b/lisp/international/mule-conf.el Fri Oct 30 02:00:11 2009 +0000 @@ -109,8 +109,8 @@ (put-charset-property 'emacs :long-name "Emacs") -(put-charset-property 'eight-bit :docstring "Raw bytes 128-255") -(put-charset-property 'eight-bit :short-name "Raw bytes") +(put-charset-property 'eight-bit :docstring (purecopy "Raw bytes 128-255")) +(put-charset-property 'eight-bit :short-name (purecopy "Raw bytes")) (define-charset-alias 'ucs 'unicode)
--- a/lisp/language/tibetan.el Thu Oct 29 16:46:52 2009 +0000 +++ b/lisp/language/tibetan.el Fri Oct 30 02:00:11 2009 +0000 @@ -568,6 +568,7 @@ from a roman transcription to the corresponding Tibetan character.") (defvar tibetan-precomposed-regexp + (purecopy (let ((l tibetan-precomposed-transcription-alist) temp) (setq temp "^\\(") @@ -578,12 +579,13 @@ (setq temp (concat temp "\\|" (car (car l)))) (setq l (cdr l))) - (concat temp "\\)")) + (concat temp "\\)"))) "Regexp string to match a romanized Tibetan complex consonant. The result of matching is to be used for indexing alists when the input key from an input method is converted to the corresponding precomposed glyph.") (defvar tibetan-precomposition-rule-regexp + (purecopy (let ((l tibetan-precomposition-rule-alist) temp) (setq temp "\\(") @@ -592,7 +594,7 @@ (while l (setq temp (concat temp "\\|" (car (car l)))) (setq l (cdr l))) - (concat temp "\\)")) + (concat temp "\\)"))) "Regexp string to match a sequence of Tibetan consonantic components, i.e., one base consonant and one or more subjoined consonants. The result of matching is to be used for indexing alist when the component
--- a/lisp/mail/sendmail.el Thu Oct 29 16:46:52 2009 +0000 +++ b/lisp/mail/sendmail.el Fri Oct 30 02:00:11 2009 +0000 @@ -1645,7 +1645,7 @@ ;; Put these commands last, to reduce chance of lossage from quitting ;; in middle of loading the file. -;;;###autoload (add-hook 'same-window-buffer-names "*mail*") +;;;###autoload (add-hook 'same-window-buffer-names (purecopy "*mail*")) ;;;###autoload (defun mail (&optional noerase to subject in-reply-to cc replybuffer actions)
--- a/lisp/paths.el Thu Oct 29 16:46:52 2009 +0000 +++ b/lisp/paths.el Fri Oct 30 02:00:11 2009 +0000 @@ -122,7 +122,7 @@ The name of the host running an NNTP server. The null string means use the local host as the server site.") -(defvar gnus-nntp-service "nntp" "\ +(defvar gnus-nntp-service (purecopy "nntp") "\ NNTP service name, usually \"nntp\" or 119. Go to a local news spool if its value is nil, in which case `gnus-nntp-server' should be set to `(system-name)'.") @@ -138,6 +138,7 @@ :version "21.1") (defvar rmail-spool-directory + (purecopy (cond ((file-exists-p "/var/mail") ;; SVR4 and recent BSD are said to use this. ;; Rather than trying to know precisely which systems use it, @@ -148,7 +149,7 @@ "/var/spool/mail/") ((memq system-type '(hpux usg-unix-v irix)) "/usr/mail/") - (t "/usr/spool/mail/")) + (t "/usr/spool/mail/"))) "Name of directory used by system mailer for delivering new mail. Its name should end with a slash.") @@ -177,7 +178,7 @@ :group 'environment :type 'file) -(defvar term-file-prefix "term/" "\ +(defvar term-file-prefix (purecopy "term/") "\ If non-nil, Emacs startup does (load (concat term-file-prefix (getenv \"TERM\"))) You may set this variable to nil in your `.emacs' file if you do not wish the terminal-initialization file to be loaded.")
--- a/lisp/progmodes/inf-lisp.el Thu Oct 29 16:46:52 2009 +0000 +++ b/lisp/progmodes/inf-lisp.el Fri Oct 30 02:00:11 2009 +0000 @@ -308,7 +308,7 @@ (inferior-lisp-mode))) (setq inferior-lisp-buffer "*inferior-lisp*") (pop-to-buffer "*inferior-lisp*")) -;;;###autoload (add-hook 'same-window-buffer-names "*inferior-lisp*") +;;;###autoload (add-hook 'same-window-buffer-names (purecopy "*inferior-lisp*")) ;;;###autoload (defalias 'run-lisp 'inferior-lisp)
--- a/lisp/progmodes/python.el Thu Oct 29 16:46:52 2009 +0000 +++ b/lisp/progmodes/python.el Fri Oct 30 02:00:11 2009 +0000 @@ -87,8 +87,8 @@ ;;;###autoload (add-to-list 'interpreter-mode-alist '("python" . python-mode)) ;;;###autoload -(add-to-list 'auto-mode-alist '("\\.py\\'" . python-mode)) -(add-to-list 'same-window-buffer-names "*Python*") +(add-to-list 'auto-mode-alist (cons (purecopy "\\.py\\'") 'python-mode)) +(add-to-list 'same-window-buffer-names (purecopy "*Python*")) ;;;; Font lock
--- a/lisp/shell.el Thu Oct 29 16:46:52 2009 +0000 +++ b/lisp/shell.el Fri Oct 30 02:00:11 2009 +0000 @@ -575,7 +575,7 @@ buffer) ;; Don't do this when shell.el is loaded, only while dumping. -;;;###autoload (add-hook 'same-window-buffer-names "*shell*") +;;;###autoload (add-hook 'same-window-buffer-names (purecopy "*shell*")) ;;; Directory tracking ;;
--- a/lisp/simple.el Thu Oct 29 16:46:52 2009 +0000 +++ b/lisp/simple.el Fri Oct 30 02:00:11 2009 +0000 @@ -5228,9 +5228,9 @@ (message "Word wrapping %s" (if word-wrap "enabled" "disabled"))) -(defvar overwrite-mode-textual " Ovwrt" +(defvar overwrite-mode-textual (purecopy " Ovwrt") "The string displayed in the mode line when in overwrite mode.") -(defvar overwrite-mode-binary " Bin Ovwrt" +(defvar overwrite-mode-binary (purecopy " Bin Ovwrt") "The string displayed in the mode line when in binary overwrite mode.") (defun overwrite-mode (arg)
--- a/lisp/startup.el Thu Oct 29 16:46:52 2009 +0000 +++ b/lisp/startup.el Fri Oct 30 02:00:11 2009 +0000 @@ -382,9 +382,9 @@ (defvar pure-space-overflow nil "Non-nil if building Emacs overflowed pure space.") -(defvar pure-space-overflow-message "\ +(defvar pure-space-overflow-message (purecopy "\ Warning Warning!!! Pure space overflow !!!Warning Warning -\(See the node Pure Storage in the Lisp manual for details.)\n") +\(See the node Pure Storage in the Lisp manual for details.)\n")) (defcustom tutorial-directory (file-name-as-directory (expand-file-name "tutorials" data-directory))
--- a/lisp/textmodes/ispell.el Thu Oct 29 16:46:52 2009 +0000 +++ b/lisp/textmodes/ispell.el Fri Oct 30 02:00:11 2009 +0000 @@ -1393,16 +1393,16 @@ ;;;###autoload (defvar ispell-skip-region-alist - '((ispell-words-keyword forward-line) + `((ispell-words-keyword forward-line) (ispell-dictionary-keyword forward-line) (ispell-pdict-keyword forward-line) (ispell-parsing-keyword forward-line) - ("^---*BEGIN PGP [A-Z ]*--*" . "^---*END PGP [A-Z ]*--*") + (,(purecopy "^---*BEGIN PGP [A-Z ]*--*") . ,(purecopy "^---*END PGP [A-Z ]*--*")) ;; assume multiline uuencoded file? "\nM.*$"? - ("^begin [0-9][0-9][0-9] [^ \t]+$" . "\nend\n") - ("^%!PS-Adobe-[123].0" . "\n%%EOF\n") - ("^---* \\(Start of \\)?[Ff]orwarded [Mm]essage" - . "^---* End of [Ff]orwarded [Mm]essage") + (,(purecopy "^begin [0-9][0-9][0-9] [^ \t]+$") . ,(purecopy "\nend\n")) + (,(purecopy "^%!PS-Adobe-[123].0") . ,(purecopy "\n%%EOF\n")) + (,(purecopy "^---* \\(Start of \\)?[Ff]orwarded [Mm]essage") + . ,(purecopy "^---* End of [Ff]orwarded [Mm]essage")) ;; Matches e-mail addresses, file names, http addresses, etc. The ;; `-+' `_+' patterns are necessary for performance reasons when ;; `-' or `_' part of word syntax.
--- a/src/ChangeLog Thu Oct 29 16:46:52 2009 +0000 +++ b/src/ChangeLog Fri Oct 30 02:00:11 2009 +0000 @@ -1,3 +1,9 @@ +2009-10-30 Dan Nicolaescu <dann@ics.uci.edu> + + * puresize.h (BASE_PURESIZE): Increase to 1470000. + + * lread.c (Fload): Purecopy the file name when building Vpreloaded_file_list. + 2009-10-29 Jason Rumney <jasonr@wanchan.jasonrumney.net> * w32fns.c (syms_of_w32fns): Change default value of
--- a/src/lread.c Thu Oct 29 16:46:52 2009 +0000 +++ b/src/lread.c Fri Oct 30 02:00:11 2009 +0000 @@ -1242,7 +1242,7 @@ } if (! NILP (Vpurify_flag)) - Vpreloaded_file_list = Fcons (file, Vpreloaded_file_list); + Vpreloaded_file_list = Fcons (Fpurecopy(file), Vpreloaded_file_list); if (NILP (nomessage) || force_load_messages) {
--- a/src/puresize.h Thu Oct 29 16:46:52 2009 +0000 +++ b/src/puresize.h Fri Oct 30 02:00:11 2009 +0000 @@ -41,7 +41,7 @@ #endif #ifndef BASE_PURESIZE -#define BASE_PURESIZE (1430000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA) +#define BASE_PURESIZE (1470000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA) #endif /* Increase BASE_PURESIZE by a ratio depending on the machine's word size. */