# HG changeset patch # User Dan Nicolaescu # Date 1257921401 0 # Node ID e411fa8e0abfe6c8454060828aad150ebb81920a # Parent 981ea078cf76370e0c6e04e6d436bbc598b3f132 * progmodes/grep.el (grep-regexp-alist): * international/mule-cmds.el (iso-2022-control-alist): * emacs-lisp/timer.el (timer-duration-words): * subr.el (version-separator, version-regexp-alist): * minibuffer.el (completion-styles-alist): * faces.el (face-attribute-name-alist, list-faces-sample-text): Change defvars to defconsts. diff -r 981ea078cf76 -r e411fa8e0abf lisp/ChangeLog --- a/lisp/ChangeLog Wed Nov 11 06:30:38 2009 +0000 +++ b/lisp/ChangeLog Wed Nov 11 06:36:41 2009 +0000 @@ -1,5 +1,13 @@ 2009-11-11 Dan Nicolaescu + * progmodes/grep.el (grep-regexp-alist): + * international/mule-cmds.el (iso-2022-control-alist): + * emacs-lisp/timer.el (timer-duration-words): + * subr.el (version-separator, version-regexp-alist): + * minibuffer.el (completion-styles-alist): + * faces.el (face-attribute-name-alist, list-faces-sample-text): + Change defvars to defconsts. + * Makefile.in (ELCFILES): Add international/mule-conf.elc. * loadup.el ("international/mule-conf"): Load the byte compiled version. * international/mule-conf.el: Allow to be byte compiled. diff -r 981ea078cf76 -r e411fa8e0abf lisp/emacs-lisp/timer.el --- a/lisp/emacs-lisp/timer.el Wed Nov 11 06:30:38 2009 +0000 +++ b/lisp/emacs-lisp/timer.el Wed Nov 11 06:36:41 2009 +0000 @@ -496,7 +496,7 @@ (with-timeout (seconds default-value) (y-or-n-p prompt))) -(defvar timer-duration-words +(defconst timer-duration-words (list (cons "microsec" 0.000001) (cons "microsecond" 0.000001) (cons "millisec" 0.001) diff -r 981ea078cf76 -r e411fa8e0abf lisp/faces.el --- a/lisp/faces.el Wed Nov 11 06:30:38 2009 +0000 +++ b/lisp/faces.el Wed Nov 11 06:36:41 2009 +0000 @@ -1047,7 +1047,7 @@ valid))) -(defvar face-attribute-name-alist +(defconst face-attribute-name-alist '((:family . "font family") (:foundry . "font foundry") (:width . "character set width") @@ -1235,7 +1235,7 @@ ;;; Listing faces. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(defvar list-faces-sample-text +(defconst list-faces-sample-text "abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ" "*Text string to display as the sample text for `list-faces-display'.") diff -r 981ea078cf76 -r e411fa8e0abf lisp/international/mule-cmds.el --- a/lisp/international/mule-cmds.el Wed Nov 11 06:30:38 2009 +0000 +++ b/lisp/international/mule-cmds.el Wed Nov 11 06:36:41 2009 +0000 @@ -2815,7 +2815,7 @@ ;; Pretty description of encoded string ;; Alist of ISO 2022 control code vs the corresponding mnemonic string. -(defvar iso-2022-control-alist +(defconst iso-2022-control-alist '((?\x1b . "ESC") (?\x0e . "SO") (?\x0f . "SI") diff -r 981ea078cf76 -r e411fa8e0abf lisp/minibuffer.el --- a/lisp/minibuffer.el Wed Nov 11 06:30:38 2009 +0000 +++ b/lisp/minibuffer.el Wed Nov 11 06:36:41 2009 +0000 @@ -358,7 +358,7 @@ :type '(choice (const nil) (const t) (const lazy)) :group 'minibuffer) -(defvar completion-styles-alist +(defconst completion-styles-alist '((emacs21 completion-emacs21-try-completion completion-emacs21-all-completions "Simple prefix-based completion.") diff -r 981ea078cf76 -r e411fa8e0abf lisp/progmodes/grep.el --- a/lisp/progmodes/grep.el Wed Nov 11 06:30:38 2009 +0000 +++ b/lisp/progmodes/grep.el Wed Nov 11 06:36:41 2009 +0000 @@ -329,7 +329,7 @@ `complation-last-buffer' rather than `grep-last-buffer'.") ;;;###autoload -(defvar grep-regexp-alist +(defconst grep-regexp-alist '(("^\\(.+?\\)\\(:[ \t]*\\)\\([0-9]+\\)\\2" 1 3) ;; Rule to match column numbers is commented out since no known grep diff -r 981ea078cf76 -r e411fa8e0abf lisp/subr.el --- a/lisp/subr.el Wed Nov 11 06:30:38 2009 +0000 +++ b/lisp/subr.el Wed Nov 11 06:36:41 2009 +0000 @@ -3546,13 +3546,13 @@ ;;;; Comparing version strings. -(defvar version-separator "." +(defconst version-separator "." "*Specify the string used to separate the version elements. Usually the separator is \".\", but it can be any other string.") -(defvar version-regexp-alist +(defconst version-regexp-alist '(("^[-_+ ]?a\\(lpha\\)?$" . -3) ("^[-_+]$" . -3) ; treat "1.2.3-20050920" and "1.2-3" as alpha releases ("^[-_+ ]cvs$" . -3) ; treat "1.2.3-CVS" as alpha release