From 2f7f4beee9769664ec99df193a16fef337d8812a Mon Sep 17 00:00:00 2001
From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Wed, 11 Nov 2009 06:36:41 +0000
Subject: [PATCH] * 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.

---
 lisp/ChangeLog                  | 8 ++++++++
 lisp/emacs-lisp/timer.el        | 2 +-
 lisp/faces.el                   | 4 ++--
 lisp/international/mule-cmds.el | 2 +-
 lisp/minibuffer.el              | 2 +-
 lisp/progmodes/grep.el          | 2 +-
 lisp/subr.el                    | 4 ++--
 7 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5b9b8880db6..46e04699970 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,13 @@
 2009-11-11  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	* 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 --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index bbb10797934..34f9473b982 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -496,7 +496,7 @@ If the user does not answer after SECONDS seconds, return DEFAULT-VALUE."
   (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 --git a/lisp/faces.el b/lisp/faces.el
index ebdca457177..e117eb16751 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1047,7 +1047,7 @@ an integer value."
       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 @@ Value is a list (FACE NEW-VALUE) where FACE is the face read
 ;;; 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 --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index e11aff4eb6e..a9b94e8ded2 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2815,7 +2815,7 @@ If there's no description string for VALUE, return nil."
 ;; 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 --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 823b56e7125..244acbc4c36 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -358,7 +358,7 @@ the second failed attempt to complete."
   :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 --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 9387a087e47..7d01777d441 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -329,7 +329,7 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
 `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 --git a/lisp/subr.el b/lisp/subr.el
index fb832608cd4..2bc4c6b2bd2 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3546,13 +3546,13 @@ convenience wrapper around `make-progress-reporter' and friends.
 
 ;;;; 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
-- 
2.11.4.GIT