Mercurial > emacs
changeset 105715:6b8dce5c4461
* puresize.h (BASE_PURESIZE): Increase to 1430000.
* term/tty-colors.el (msdos-color-values): Remove declaration, unused.
(color-name-rgb-alist, tty-standard-colors)
(tty-color-mode-alist): Change to defconst.
* simple.el (mark-inactive): Purecopy message.
* menu-bar.el (menu-bar-make-mm-toggle, menu-bar-make-toggle): Fix macro.
(global-map, yank-menu):
* textmodes/ispell.el (ispell-menu-map):
* net/eudc.el (eudc-tools-menu):
* international/mule-cmds.el (describe-language-environment-map)
(setup-language-environment-map, set-coding-system-map)
(mule-menu-keymap):
* vc-hooks.el (vc-menu-entry, vc-menu-map):
* replace.el (occur-mode-map):
* pcvs-defs.el (cvs-global-menu): Purecopy names and tooltips.
* bindings.el (propertized-buffer-identification): Purecopy
tooltip text.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Fri, 23 Oct 2009 05:15:26 +0000 |
| parents | f7cff45183ee |
| children | f54ffcb2681e |
| files | lisp/ChangeLog lisp/bindings.el lisp/international/mule-cmds.el lisp/menu-bar.el lisp/net/eudc.el lisp/pcvs-defs.el lisp/replace.el lisp/simple.el lisp/term/tty-colors.el lisp/textmodes/ispell.el lisp/vc-hooks.el src/ChangeLog src/puresize.h |
| diffstat | 13 files changed, 190 insertions(+), 166 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Oct 23 01:40:13 2009 +0000 +++ b/lisp/ChangeLog Fri Oct 23 05:15:26 2009 +0000 @@ -1,3 +1,25 @@ +2009-10-23 Dan Nicolaescu <dann@ics.uci.edu> + + * term/tty-colors.el (msdos-color-values): Remove declaration, unused. + (color-name-rgb-alist, tty-standard-colors) + (tty-color-mode-alist): Change to defconst. + + * simple.el (mark-inactive): Purecopy message. + + * menu-bar.el (menu-bar-make-mm-toggle, menu-bar-make-toggle): Fix macro. + (global-map, yank-menu): + * textmodes/ispell.el (ispell-menu-map): + * net/eudc.el (eudc-tools-menu): + * international/mule-cmds.el (describe-language-environment-map) + (setup-language-environment-map, set-coding-system-map) + (mule-menu-keymap): + * vc-hooks.el (vc-menu-entry, vc-menu-map): + * replace.el (occur-mode-map): + * pcvs-defs.el (cvs-global-menu): Purecopy names and tooltips. + + * bindings.el (propertized-buffer-identification): Purecopy + tooltip text. + 2009-10-23 Jay Belanger <jay.p.belanger@gmail.com> * calc/calc.el (math-read-number, math-read-number-simple): Use
--- a/lisp/bindings.el Fri Oct 23 01:40:13 2009 +0000 +++ b/lisp/bindings.el Fri Oct 23 05:15:26 2009 +0000 @@ -450,10 +450,10 @@ "Return a list suitable for `mode-line-buffer-identification'. FMT is a format specifier such as \"%12b\". This function adds text properties for face, help-echo, and local-map to it." - (list (propertize fmt + `(list (propertize fmt 'face 'mode-line-buffer-id 'help-echo - (purecopy "Buffer name\n\ + ,(purecopy "Buffer name\n\ mouse-1: previous buffer\n\ mouse-3: next buffer") 'mouse-face 'mode-line-highlight
--- a/lisp/international/mule-cmds.el Fri Oct 23 01:40:13 2009 +0000 +++ b/lisp/international/mule-cmds.el Fri Oct 23 05:15:26 2009 +0000 @@ -62,97 +62,97 @@ (defvar describe-language-environment-map (let ((map (make-sparse-keymap "Describe Language Environment"))) (define-key map - [Default] '(menu-item "Default" describe-specified-language-support)) + [Default] `(menu-item ,(purecopy "Default") describe-specified-language-support)) map)) (defvar setup-language-environment-map (let ((map (make-sparse-keymap "Set Language Environment"))) (define-key map - [Default] '(menu-item "Default" setup-specified-language-environment)) + [Default] `(menu-item ,(purecopy "Default") setup-specified-language-environment)) map)) (defvar set-coding-system-map (let ((map (make-sparse-keymap "Set Coding System"))) (define-key-after map [universal-coding-system-argument] - '(menu-item "For Next Command" universal-coding-system-argument - :help "Coding system to be used by next command")) + `(menu-item ,(purecopy "For Next Command") universal-coding-system-argument + :help ,(purecopy "Coding system to be used by next command"))) (define-key-after map [separator-1] '("--")) (define-key-after map [set-buffer-file-coding-system] - '(menu-item "For Saving This Buffer" set-buffer-file-coding-system - :help "How to encode this buffer when saved")) + `(menu-item ,(purecopy "For Saving This Buffer") set-buffer-file-coding-system + :help ,(purecopy "How to encode this buffer when saved"))) (define-key-after map [revert-buffer-with-coding-system] - '(menu-item "For Reverting This File Now" + `(menu-item ,(purecopy "For Reverting This File Now") revert-buffer-with-coding-system :enable buffer-file-name - :help "Revisit this file immediately using specified coding system")) + :help ,(purecopy "Revisit this file immediately using specified coding system"))) (define-key-after map [set-file-name-coding-system] - '(menu-item "For File Name" set-file-name-coding-system - :help "How to decode/encode file names")) + `(menu-item ,(purecopy "For File Name") set-file-name-coding-system + :help ,(purecopy "How to decode/encode file names"))) (define-key-after map [separator-2] '("--")) (define-key-after map [set-keyboard-coding-system] - '(menu-item "For Keyboard" set-keyboard-coding-system - :help "How to decode keyboard input")) + `(menu-item ,(purecopy "For Keyboard") set-keyboard-coding-system + :help ,(purecopy "How to decode keyboard input"))) (define-key-after map [set-terminal-coding-system] - '(menu-item "For Terminal" set-terminal-coding-system + `(menu-item ,(purecopy "For Terminal") set-terminal-coding-system :enable (null (memq initial-window-system '(x w32 ns))) - :help "How to encode terminal output")) + :help ,(purecopy "How to encode terminal output"))) (define-key-after map [separator-3] '("--")) (define-key-after map [set-selection-coding-system] - '(menu-item "For X Selections/Clipboard" set-selection-coding-system + `(menu-item ,(purecopy "For X Selections/Clipboard") set-selection-coding-system :visible (display-selections-p) - :help "How to en/decode data to/from selection/clipboard")) + :help ,(purecopy "How to en/decode data to/from selection/clipboard"))) (define-key-after map [set-next-selection-coding-system] - '(menu-item "For Next X Selection" set-next-selection-coding-system + `(menu-item ,(purecopy "For Next X Selection") set-next-selection-coding-system :visible (display-selections-p) - :help "How to en/decode next selection/clipboard operation")) + :help ,(purecopy "How to en/decode next selection/clipboard operation"))) (define-key-after map [set-buffer-process-coding-system] - '(menu-item "For I/O with Subprocess" set-buffer-process-coding-system + `(menu-item ,(purecopy "For I/O with Subprocess") set-buffer-process-coding-system :visible (fboundp 'start-process) :enable (get-buffer-process (current-buffer)) - :help "How to en/decode I/O from/to subprocess connected to this buffer")) + :help ,(purecopy "How to en/decode I/O from/to subprocess connected to this buffer"))) map)) (defvar mule-menu-keymap (let ((map (make-sparse-keymap "Mule (Multilingual Environment)"))) (define-key-after map [set-language-environment] - `(menu-item "Set Language Environment" ,setup-language-environment-map)) + `(menu-item ,(purecopy "Set Language Environment") ,setup-language-environment-map)) (define-key-after map [separator-mule] '("--")) (define-key-after map [toggle-input-method] - '(menu-item "Toggle Input Method" toggle-input-method)) + `(menu-item ,(purecopy "Toggle Input Method") toggle-input-method)) (define-key-after map [set-input-method] - '(menu-item "Select Input Method..." set-input-method)) + `(menu-item ,(purecopy "Select Input Method...") set-input-method)) (define-key-after map [describe-input-method] - '(menu-item "Describe Input Method" describe-input-method)) + `(menu-item ,(purecopy "Describe Input Method") describe-input-method)) (define-key-after map [separator-input-method] '("--")) (define-key-after map [set-various-coding-system] - `(menu-item "Set Coding Systems" ,set-coding-system-map + `(menu-item ,(purecopy "Set Coding Systems") ,set-coding-system-map :enable (default-value 'enable-multibyte-characters))) (define-key-after map [view-hello-file] - '(menu-item "Show Multi-lingual Text" view-hello-file + `(menu-item ,(purecopy "Show Multi-lingual Text") view-hello-file :enable (file-readable-p (expand-file-name "HELLO" data-directory)) - :help "Display file which says HELLO in many languages")) + :help ,(purecopy "Display file which says HELLO in many languages"))) (define-key-after map [separator-coding-system] '("--")) (define-key-after map [describe-language-environment] - (list 'menu-item "Describe Language Environment" + `(menu-item ,(purecopy "Describe Language Environment") describe-language-environment-map - :help "Show multilingual settings for a specific language")) + :help ,(purecopy "Show multilingual settings for a specific language"))) (define-key-after map [describe-input-method] - '(menu-item "Describe Input Method..." describe-input-method - :help "Keyboard layout for a specific input method")) + `(menu-item ,(purecopy "Describe Input Method...") describe-input-method + :help ,(purecopy "Keyboard layout for a specific input method"))) (define-key-after map [describe-coding-system] - '(menu-item "Describe Coding System..." describe-coding-system)) + `(menu-item ,(purecopy "Describe Coding System...") describe-coding-system)) (define-key-after map [list-character-sets] - '(menu-item "List Character Sets" list-character-sets - :help "Show table of available character sets")) + `(menu-item ,(purecopy "List Character Sets") list-character-sets + :help ,(purecopy "Show table of available character sets"))) (define-key-after map [mule-diag] - '(menu-item "Show All of Mule Status" mule-diag - :help "Display multilingual environment settings")) + `(menu-item ,(purecopy "Show All of Mule Status") mule-diag + :help ,(purecopy "Display multilingual environment settings"))) map) "Keymap for Mule (Multilingual environment) menu specific commands.")
--- a/lisp/menu-bar.el Fri Oct 23 01:40:13 2009 +0000 +++ b/lisp/menu-bar.el Fri Oct 23 05:15:26 2009 +0000 @@ -39,21 +39,21 @@ ;; help key. (setq menu-bar-final-items '(help-menu)) -(define-key global-map [menu-bar help-menu] (cons "Help" menu-bar-help-menu)) +(define-key global-map [menu-bar help-menu] (cons (purecopy "Help") menu-bar-help-menu)) (defvar menu-bar-tools-menu (make-sparse-keymap "Tools")) -(define-key global-map [menu-bar tools] (cons "Tools" menu-bar-tools-menu)) +(define-key global-map [menu-bar tools] (cons (purecopy "Tools") menu-bar-tools-menu)) ;; This definition is just to show what this looks like. ;; It gets modified in place when menu-bar-update-buffers is called. (defvar global-buffers-menu-map (make-sparse-keymap "Buffers")) (define-key global-map [menu-bar buffer] - (cons "Buffers" global-buffers-menu-map)) + (cons (purecopy "Buffers") global-buffers-menu-map)) (defvar menu-bar-options-menu (make-sparse-keymap "Options")) (define-key global-map [menu-bar options] - (cons "Options" menu-bar-options-menu)) + (cons (purecopy "Options") menu-bar-options-menu)) (defvar menu-bar-edit-menu (make-sparse-keymap "Edit")) -(define-key global-map [menu-bar edit] (cons "Edit" menu-bar-edit-menu)) +(define-key global-map [menu-bar edit] (cons (purecopy "Edit") menu-bar-edit-menu)) (defvar menu-bar-file-menu (make-sparse-keymap "File")) -(define-key global-map [menu-bar file] (cons "File" menu-bar-file-menu)) +(define-key global-map [menu-bar file] (cons (purecopy "File") menu-bar-file-menu)) ;; This alias is for compatibility with 19.28 and before. (defvar menu-bar-files-menu menu-bar-file-menu) @@ -447,7 +447,7 @@ (not (mouse-region-match))) :help ,(purecopy "Delete the text in region between mark and current position"))) -(defvar yank-menu (cons "Select Yank" nil)) +(defvar yank-menu (cons (purecopy "Select Yank") nil)) (fset 'yank-menu (cons 'keymap yank-menu)) (define-key menu-bar-edit-menu [paste-from-menu] `(menu-item ,(purecopy "Paste from Kill Menu") yank-menu @@ -596,11 +596,11 @@ DOC is the text to use for the menu entry. HELP is the text to use for the tooltip. PROPS are additional properties." - `'(menu-item ,(purecopy doc) ,fname - ,@props - :help ,(purecopy help) - :button (:toggle . (and (default-boundp ',fname) - (default-value ',fname))))) + `(list 'menu-item (purecopy ,doc) ',fname + ,@props + ':help (purecopy ,help) + ':button '(:toggle . (and (default-boundp ',fname) + (default-value ',fname))))) (defmacro menu-bar-make-toggle (name variable doc message help &rest body) `(progn @@ -623,9 +623,9 @@ ;; a candidate for "Save Options", and we do not want to save options ;; the user have already set explicitly in his init file. (if interactively (customize-mark-as-set ',variable))) - '(menu-item ,(purecopy doc) ,name - :help ,(purecopy help) - :button (:toggle . (and (default-boundp ',variable) + (list 'menu-item (purecopy ,doc) ',name + ':help (purecopy ,help) + ':button '(:toggle . (and (default-boundp ',variable) (default-value ',variable)))))) ;; Function for setting/saving default font. @@ -1860,7 +1860,7 @@ ;; bug in keymap.c that I don't understand yet. -stef minibuffer-local-completion-map)) (define-key map [menu-bar minibuf] - (cons "Minibuf" (make-sparse-keymap "Minibuf")))) + (cons (purecopy "Minibuf") (make-sparse-keymap "Minibuf")))) (let ((map minibuffer-local-completion-map)) (define-key map [menu-bar minibuf ?\?]
--- a/lisp/net/eudc.el Fri Oct 23 01:40:13 2009 +0000 +++ b/lisp/net/eudc.el Fri Oct 23 05:15:26 2009 +0000 @@ -1242,25 +1242,25 @@ (defvar eudc-tools-menu (let ((map (make-sparse-keymap "Directory Search"))) (define-key map [phone] - '(menu-item "Get Phone" eudc-get-phone - :help "Get the phone field of name from the directory server")) + `(menu-item ,(purecopy "Get Phone") eudc-get-phone + :help ,(purecopy "Get the phone field of name from the directory server"))) (define-key map [email] - '(menu-item "Get Email" eudc-get-email - :help "Get the email field of NAME from the directory server")) + `(menu-item ,(purecopy "Get Email") eudc-get-email + :help ,(purecopy "Get the email field of NAME from the directory server"))) (define-key map [separator-eudc-email] '("--")) (define-key map [expand-inline] - '(menu-item "Expand Inline Query" eudc-expand-inline - :help "Query the directory server, and expand the query string before point")) + `(menu-item ,(purecopy "Expand Inline Query") eudc-expand-inline + :help ,(purecopy "Query the directory server, and expand the query string before point"))) (define-key map [query] - '(menu-item "Query with Form" eudc-query-form - :help "Display a form to query the directory server")) + `(menu-item ,(purecopy "Query with Form") eudc-query-form + :help ,(purecopy "Display a form to query the directory server"))) (define-key map [separator-eudc-query] '("--")) (define-key map [new] - '(menu-item "New Server" eudc-set-server - :help "Set the directory server to SERVER using PROTOCOL")) + `(menu-item ,(purecopy "New Server") eudc-set-server + :help ,(purecopy "Set the directory server to SERVER using PROTOCOL"))) (define-key map [load] - '(menu-item "Load Hotlist of Servers" eudc-load-eudc - :help "Load the Emacs Unified Directory Client")) + `(menu-item ,(purecopy "Load Hotlist of Servers") eudc-load-eudc + :help ,(purecopy "Load the Emacs Unified Directory Client"))) map)) (fset 'eudc-tools-menu (symbol-value 'eudc-tools-menu))) (t
--- a/lisp/pcvs-defs.el Fri Oct 23 01:40:13 2009 +0000 +++ b/lisp/pcvs-defs.el Fri Oct 23 05:15:26 2009 +0000 @@ -483,17 +483,17 @@ (defvar cvs-global-menu (let ((m (make-sparse-keymap "PCL-CVS"))) (define-key m [status] - '(menu-item "Directory Status" cvs-status - :help "A more verbose status of a workarea")) + `(menu-item ,(purecopy "Directory Status") cvs-status + :help ,(purecopy "A more verbose status of a workarea"))) (define-key m [checkout] - '(menu-item "Checkout Module" cvs-checkout - :help "Check out a module from the repository")) + `(menu-item ,(purecopy "Checkout Module") cvs-checkout + :help ,(purecopy "Check out a module from the repository"))) (define-key m [update] - '(menu-item "Update Directory" cvs-update - :help "Fetch updates from the repository")) + `(menu-item ,(purecopy "Update Directory") cvs-update + :help ,(purecopy "Fetch updates from the repository"))) (define-key m [examine] - '(menu-item "Examine Directory" cvs-examine - :help "Examine the current state of a workarea")) + `(menu-item ,(purecopy "Examine Directory") cvs-examine + :help ,(purecopy "Examine the current state of a workarea"))) (fset 'cvs-global-menu m)))
--- a/lisp/replace.el Fri Oct 23 01:40:13 2009 +0000 +++ b/lisp/replace.el Fri Oct 23 05:15:26 2009 +0000 @@ -768,43 +768,43 @@ (define-key map "\C-c\C-f" 'next-error-follow-minor-mode) (define-key map [menu-bar] (make-sparse-keymap)) (define-key map [menu-bar occur] - (cons "Occur" map)) + `(cons ,(purecopy "Occur") map)) (define-key map [next-error-follow-minor-mode] (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 [kill-this-buffer] - '(menu-item "Kill occur buffer" kill-this-buffer - :help "Kill the current *Occur* buffer")) + `(menu-item ,(purecopy "Kill occur buffer") kill-this-buffer + :help ,(purecopy "Kill the current *Occur* buffer"))) (define-key map [quit-window] - '(menu-item "Quit occur window" quit-window - :help "Quit the current *Occur* buffer. Bury it, and maybe delete the selected frame")) + `(menu-item ,(purecopy "Quit occur window") quit-window + :help ,(purecopy "Quit the current *Occur* buffer. Bury it, and maybe delete the selected frame"))) (define-key map [revert-buffer] - '(menu-item "Revert occur buffer" revert-buffer - :help "Replace the text in the *Occur* buffer with the results of rerunning occur")) + `(menu-item ,(purecopy "Revert occur buffer") revert-buffer + :help ,(purecopy "Replace the text in the *Occur* buffer with the results of rerunning occur"))) (define-key map [clone-buffer] - '(menu-item "Clone occur buffer" clone-buffer - :help "Create and return a twin copy of the current *Occur* buffer")) + `(menu-item ,(purecopy "Clone occur buffer") clone-buffer + :help ,(purecopy "Create and return a twin copy of the current *Occur* buffer"))) (define-key map [occur-rename-buffer] - '(menu-item "Rename occur buffer" occur-rename-buffer - :help "Rename the current *Occur* buffer to *Occur: original-buffer-name*.")) + `(menu-item ,(purecopy "Rename occur buffer") occur-rename-buffer + :help ,(purecopy "Rename the current *Occur* buffer to *Occur: original-buffer-name*."))) (define-key map [separator-2] '("--")) (define-key map [occur-mode-goto-occurrence-other-window] - '(menu-item "Go To Occurrence Other Window" occur-mode-goto-occurrence-other-window - :help "Go to the occurrence the current line describes, in another window")) + `(menu-item ,(purecopy "Go To Occurrence Other Window") occur-mode-goto-occurrence-other-window + :help ,(purecopy "Go to the occurrence the current line describes, in another window"))) (define-key map [occur-mode-goto-occurrence] - '(menu-item "Go To Occurrence" occur-mode-goto-occurrence - :help "Go to the occurrence the current line describes")) + `(menu-item ,(purecopy "Go To Occurrence") occur-mode-goto-occurrence + :help ,(purecopy "Go to the occurrence the current line describes"))) (define-key map [occur-mode-display-occurrence] - '(menu-item "Display Occurrence" occur-mode-display-occurrence - :help "Display in another window the occurrence the current line describes")) + `(menu-item ,(purecopy "Display Occurrence") occur-mode-display-occurrence + :help ,(purecopy "Display in another window the occurrence the current line describes"))) (define-key map [occur-next] - '(menu-item "Move to next match" occur-next - :help "Move to the Nth (default 1) next match in an Occur mode buffer")) + `(menu-item ,(purecopy "Move to next match") occur-next + :help ,(purecopy "Move to the Nth (default 1) next match in an Occur mode buffer"))) (define-key map [occur-prev] - '(menu-item "Move to previous match" occur-prev - :help "Move to the Nth (default 1) previous match in an Occur mode buffer")) + `(menu-item ,(purecopy "Move to previous match") occur-prev + :help ,(purecopy "Move to the Nth (default 1) previous match in an Occur mode buffer"))) map) "Keymap for `occur-mode'.")
--- a/lisp/simple.el Fri Oct 23 01:40:13 2009 +0000 +++ b/lisp/simple.el Fri Oct 23 05:15:26 2009 +0000 @@ -3508,7 +3508,7 @@ (insert-buffer-substring oldbuf start end))))) (put 'mark-inactive 'error-conditions '(mark-inactive error)) -(put 'mark-inactive 'error-message "The mark is not active now") +(put 'mark-inactive 'error-message (purecopy "The mark is not active now")) (defvar activate-mark-hook nil "Hook run when the mark becomes active.
--- a/lisp/term/tty-colors.el Fri Oct 23 01:40:13 2009 +0000 +++ b/lisp/term/tty-colors.el Fri Oct 23 05:15:26 2009 +0000 @@ -62,8 +62,6 @@ ;;; Code: -(defvar msdos-color-values) - ;; The following list is taken from rgb.txt distributed with X. ;; ;; WARNING: Some colors, such as "lightred", do not appear in this @@ -88,7 +86,7 @@ ;; from the standard 8-bit X definitions (so the upper and lower bytes ;; of each value are actually identical). ;; -(defvar color-name-rgb-alist +(defconst color-name-rgb-alist '(("snow" 65535 64250 64250) ("ghostwhite" 63736 63736 65535) ("whitesmoke" 62965 62965 62965) @@ -748,7 +746,7 @@ ("lightgreen" 37008 61166 37008)) "An alist of X color names and associated 16-bit RGB values.") -(defvar tty-standard-colors +(defconst tty-standard-colors '(("black" 0 0 0 0) ("red" 1 65535 0 0) ("green" 2 0 65535 0) @@ -760,7 +758,7 @@ "An alist of 8 standard tty colors, their indices and RGB values.") ;; This is used by term.c -(defvar tty-color-mode-alist +(defconst tty-color-mode-alist '((never . -1) (no . -1) (default . 0)
--- a/lisp/textmodes/ispell.el Fri Oct 23 01:40:13 2009 +0000 +++ b/lisp/textmodes/ispell.el Fri Oct 23 05:15:26 2009 +0000 @@ -1135,69 +1135,69 @@ (progn (setq ispell-menu-map (make-sparse-keymap "Spell")) (define-key ispell-menu-map [ispell-change-dictionary] - '(menu-item "Change Dictionary..." ispell-change-dictionary - :help "Supply explicit dictionary file name")) + `(menu-item ,(purecopy "Change Dictionary...") ispell-change-dictionary + :help ,(purecopy "Supply explicit dictionary file name"))) (define-key ispell-menu-map [ispell-kill-ispell] - '(menu-item "Kill Process" ispell-kill-ispell + `(menu-item ,(purecopy "Kill Process") ispell-kill-ispell :enable (and (boundp 'ispell-process) ispell-process (eq (ispell-process-status) 'run)) - :help "Terminate Ispell subprocess")) + :help ,(purecopy "Terminate Ispell subprocess"))) (define-key ispell-menu-map [ispell-pdict-save] - '(menu-item "Save Dictionary" + `(menu-item ,(purecopy "Save Dictionary") (lambda () (interactive) (ispell-pdict-save t t)) - :help "Save personal dictionary")) + :help ,(purecopy "Save personal dictionary"))) (define-key ispell-menu-map [ispell-customize] - '(menu-item "Customize..." + `(menu-item ,(purecopy "Customize...") (lambda () (interactive) (customize-group 'ispell)) - :help "Customize spell checking options")) + :help ,(purecopy "Customize spell checking options"))) (define-key ispell-menu-map [ispell-help] ;; use (x-popup-menu last-nonmenu-event(list "" ispell-help-list)) ? - '(menu-item "Help" + `(menu-item ,(purecopy "Help") (lambda () (interactive) (describe-function 'ispell-help)) - :help "Show standard Ispell keybindings and commands")) + :help ,(purecopy "Show standard Ispell keybindings and commands"))) (define-key ispell-menu-map [flyspell-mode] - '(menu-item "Automatic spell checking (Flyspell)" + `(menu-item ,(purecopy "Automatic spell checking (Flyspell)") flyspell-mode - :help "Check spelling while you edit the text" + :help ,(purecopy "Check spelling while you edit the text") :button (:toggle . (bound-and-true-p flyspell-mode)))) (define-key ispell-menu-map [ispell-complete-word] - '(menu-item "Complete Word" ispell-complete-word - :help "Complete word at cursor using dictionary")) + `(menu-item ,(purecopy "Complete Word") ispell-complete-word + :help ,(purecopy "Complete word at cursor using dictionary"))) (define-key ispell-menu-map [ispell-complete-word-interior-frag] - '(menu-item "Complete Word Fragment" ispell-complete-word-interior-frag - :help "Complete word fragment at cursor")))) + `(menu-item ,(purecopy "Complete Word Fragment") ispell-complete-word-interior-frag + :help ,(purecopy "Complete word fragment at cursor"))))) ;;;###autoload (if ispell-menu-map-needed (progn (define-key ispell-menu-map [ispell-continue] - '(menu-item "Continue Spell-Checking" ispell-continue + `(menu-item ,(purecopy "Continue Spell-Checking") ispell-continue :enable (and (boundp 'ispell-region-end) (marker-position ispell-region-end) (equal (marker-buffer ispell-region-end) (current-buffer))) - :help "Continue spell checking last region")) + :help ,(purecopy "Continue spell checking last region"))) (define-key ispell-menu-map [ispell-word] - '(menu-item "Spell-Check Word" ispell-word - :help "Spell-check word at cursor")) + `(menu-item ,(purecopy "Spell-Check Word") ispell-word + :help ,(purecopy "Spell-check word at cursor"))) (define-key ispell-menu-map [ispell-comments-and-strings] - '(menu-item "Spell-Check Comments" ispell-comments-and-strings - :help "Spell-check only comments and strings")))) + `(menu-item ,(purecopy "Spell-Check Comments") ispell-comments-and-strings + :help ,(purecopy "Spell-check only comments and strings"))))) ;;;###autoload (if ispell-menu-map-needed (progn (define-key ispell-menu-map [ispell-region] - '(menu-item "Spell-Check Region" ispell-region + `(menu-item ,(purecopy "Spell-Check Region") ispell-region :enable mark-active - :help "Spell-check text in marked region")) + :help ,(purecopy "Spell-check text in marked region"))) (define-key ispell-menu-map [ispell-message] - '(menu-item "Spell-Check Message" ispell-message + `(menu-item ,(purecopy "Spell-Check Message") ispell-message :visible (eq major-mode 'mail-mode) - :help "Skip headers and included message text")) + :help ,(purecopy "Skip headers and included message text"))) (define-key ispell-menu-map [ispell-buffer] - '(menu-item "Spell-Check Buffer" ispell-buffer - :help "Check spelling of selected buffer")) + `(menu-item ,(purecopy "Spell-Check Buffer") ispell-buffer + :help ,(purecopy "Check spelling of selected buffer"))) ;;(put 'ispell-region 'menu-enable 'mark-active) (fset 'ispell-menu-map (symbol-value 'ispell-menu-map))))
--- a/lisp/vc-hooks.el Fri Oct 23 01:40:13 2009 +0000 +++ b/lisp/vc-hooks.el Fri Oct 23 05:15:26 2009 +0000 @@ -758,7 +758,7 @@ (vc-dir-resynch-file file)))) (defvar vc-menu-entry - '(menu-item "Version Control" vc-menu-map + `(menu-item ,(purecopy "Version Control") vc-menu-map :filter vc-menu-map-filter)) (when (boundp 'menu-bar-tools-menu) @@ -962,59 +962,59 @@ ;;(define-key map [show-files] ;; '("Show Files under VC" . (vc-directory t))) (define-key map [vc-retrieve-tag] - '(menu-item "Retrieve Tag" vc-retrieve-tag - :help "Retrieve tagged version or branch")) + `(menu-item ,(purecopy "Retrieve Tag") vc-retrieve-tag + :help ,(purecopy "Retrieve tagged version or branch"))) (define-key map [vc-create-tag] - '(menu-item "Create Tag" vc-create-tag - :help "Create version tag")) + `(menu-item ,(purecopy "Create Tag") vc-create-tag + :help ,(purecopy "Create version tag"))) (define-key map [separator1] '("----")) (define-key map [vc-annotate] - '(menu-item "Annotate" vc-annotate - :help "Display the edit history of the current file using colors")) + `(menu-item ,(purecopy "Annotate") vc-annotate + :help ,(purecopy "Display the edit history of the current file using colors"))) (define-key map [vc-rename-file] - '(menu-item "Rename File" vc-rename-file - :help "Rename file")) + `(menu-item ,(purecopy "Rename File") vc-rename-file + :help ,(purecopy "Rename file"))) (define-key map [vc-revision-other-window] - '(menu-item "Show Other Version" vc-revision-other-window - :help "Visit another version of the current file in another window")) + `(menu-item ,(purecopy "Show Other Version") vc-revision-other-window + :help ,(purecopy "Visit another version of the current file in another window"))) (define-key map [vc-diff] - '(menu-item "Compare with Base Version" vc-diff - :help "Compare file set with the base version")) + `(menu-item ,(purecopy "Compare with Base Version") vc-diff + :help ,(purecopy "Compare file set with the base version"))) (define-key map [vc-root-diff] - '(menu-item "Compare Tree with Base Version" vc-root-diff - :help "Compare current tree with the base version")) + `(menu-item ,(purecopy "Compare Tree with Base Version") vc-root-diff + :help ,(purecopy "Compare current tree with the base version"))) (define-key map [vc-update-change-log] - '(menu-item "Update ChangeLog" vc-update-change-log - :help "Find change log file and add entries from recent version control logs")) + `(menu-item ,(purecopy "Update ChangeLog") vc-update-change-log + :help ,(purecopy "Find change log file and add entries from recent version control logs"))) (define-key map [vc-print-log] - '(menu-item "Show History" vc-print-log - :help "List the change log of the current file set in a window")) + `(menu-item ,(purecopy "Show History") vc-print-log + :help ,(purecopy "List the change log of the current file set in a window"))) (define-key map [vc-print-root-log] - '(menu-item "Show Top of the Tree History " vc-print-root-log - :help "List the change log for the current tree in a window")) + `(menu-item ,(purecopy "Show Top of the Tree History ") vc-print-root-log + :help ,(purecopy "List the change log for the current tree in a window"))) (define-key map [separator2] '("----")) (define-key map [vc-insert-header] - '(menu-item "Insert Header" vc-insert-headers - :help "Insert headers into a file for use with a version control system. -")) + `(menu-item ,(purecopy "Insert Header") vc-insert-headers + :help ,(purecopy "Insert headers into a file for use with a version control system. +"))) (define-key map [undo] - '(menu-item "Undo Last Check-In" vc-rollback - :help "Remove the most recent changeset committed to the repository")) + `(menu-item ,(purecopy "Undo Last Check-In") vc-rollback + :help ,(purecopy "Remove the most recent changeset committed to the repository"))) (define-key map [vc-revert] - '(menu-item "Revert to Base Version" vc-revert - :help "Revert working copies of the selected file set to their repository contents")) + `(menu-item ,(purecopy "Revert to Base Version") vc-revert + :help ,(purecopy "Revert working copies of the selected file set to their repository contents"))) (define-key map [vc-update] - '(menu-item "Update to Latest Version" vc-update - :help "Update the current fileset's files to their tip revisions")) + `(menu-item ,(purecopy "Update to Latest Version") vc-update + :help ,(purecopy "Update the current fileset's files to their tip revisions"))) (define-key map [vc-next-action] - '(menu-item "Check In/Out" vc-next-action - :help "Do the next logical version control operation on the current fileset")) + `(menu-item ,(purecopy "Check In/Out") vc-next-action + :help ,(purecopy "Do the next logical version control operation on the current fileset"))) (define-key map [vc-register] - '(menu-item "Register" vc-register - :help "Register file set into a version control system")) + `(menu-item ,(purecopy "Register") vc-register + :help ,(purecopy "Register file set into a version control system"))) (define-key map [vc-dir] - '(menu-item "VC Dir" vc-dir - :help "Show the VC status of files in a directory")) + `(menu-item ,(purecopy "VC Dir") vc-dir + :help ,(purecopy "Show the VC status of files in a directory"))) map)) (defalias 'vc-menu-map vc-menu-map)
--- a/src/ChangeLog Fri Oct 23 01:40:13 2009 +0000 +++ b/src/ChangeLog Fri Oct 23 05:15:26 2009 +0000 @@ -1,3 +1,7 @@ +2009-10-23 Dan Nicolaescu <dann@ics.uci.edu> + + * puresize.h (BASE_PURESIZE): Increase to 1430000. + 2009-10-21 Andreas Schwab <schwab@linux-m68k.org> * doprnt.c (doprnt): Fix overflow check.
--- a/src/puresize.h Fri Oct 23 01:40:13 2009 +0000 +++ b/src/puresize.h Fri Oct 23 05:15:26 2009 +0000 @@ -41,7 +41,7 @@ #endif #ifndef BASE_PURESIZE -#define BASE_PURESIZE (1310000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA) +#define BASE_PURESIZE (1430000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA) #endif /* Increase BASE_PURESIZE by a ratio depending on the machine's word size. */