Change defconsts to defvars.

7 files changed, 59 insertions, 56 deletions

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index b86e497682d..26eab753c38 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -330,8 +330,8 @@ With argument, insert value in current buffer after the defun."
       (max (if (bolp) 0 (1+ (current-column)))
 	   comment-column))))
 
-(defconst lisp-indent-offset nil "")
-(defconst lisp-indent-function 'lisp-indent-function "")
+(defvar lisp-indent-offset nil "")
+(defvar lisp-indent-function 'lisp-indent-function "")
 
 (defun lisp-indent-line (&optional whole-exp)
   "Indent current line as Lisp code.
@@ -508,7 +508,7 @@ of the start of the containing expression."
 	      (method
 		(funcall method state indent-point)))))))
 
-(defconst lisp-body-indent 2
+(defvar lisp-body-indent 2
   "Number of columns to indent the second line of a `(def...)' form.")
 
 (defun lisp-indent-specform (count state indent-point normal-indent)
diff --git a/lisp/faces.el b/lisp/faces.el
index 41d85b43c0c..797581318d2 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -615,10 +615,10 @@ set its foreground and background to the default background and foreground."
 
 ;; Manipulating font names.
 
-(defconst x-font-regexp nil)
-(defconst x-font-regexp-head nil)
-(defconst x-font-regexp-weight nil)
-(defconst x-font-regexp-slant nil)
+(defvar x-font-regexp nil)
+(defvar x-font-regexp-head nil)
+(defvar x-font-regexp-weight nil)
+(defvar x-font-regexp-slant nil)
 
 (defconst x-font-regexp-weight-subnum 1)
 (defconst x-font-regexp-slant-subnum 2)
diff --git a/lisp/files.el b/lisp/files.el
index 691ecaa37e2..1341cd909b2 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -30,10 +30,10 @@
 
 ;;; Code:
 
-(defconst delete-auto-save-files t
+(defvar delete-auto-save-files t
   "*Non-nil means delete auto-save file when a buffer is saved or killed.")
 
-(defconst directory-abbrev-alist
+(defvar directory-abbrev-alist
   nil
   "*Alist of abbreviations for file directories.
 A list of elements of the form (FROM . TO), each meaning to replace
@@ -49,7 +49,7 @@ via absolute symbolic links.  Make TO the name of the link, and FROM
 the name it is linked to.")
 
 ;;; Turn off backup files on VMS since it has version numbers.
-(defconst make-backup-files (not (eq system-type 'vax-vms))
+(defvar make-backup-files (not (eq system-type 'vax-vms))
   "*Non-nil means make a backup of a file the first time it is saved.
 This can be done by renaming the file or by copying.
 
@@ -75,16 +75,16 @@ This variable is intended for use by making it local to a buffer.
 But it is local only if you make it local.")
 (put 'backup-inhibited 'permanent-local t)
 
-(defconst backup-by-copying nil
+(defvar backup-by-copying nil
  "*Non-nil means always use copying to create backup files.
 See documentation of variable `make-backup-files'.")
 
-(defconst backup-by-copying-when-linked nil
+(defvar backup-by-copying-when-linked nil
  "*Non-nil means use copying to create backups for files with multiple names.
 This causes the alternate names to refer to the latest version as edited.
 This variable is relevant only if `backup-by-copying' is nil.")
 
-(defconst backup-by-copying-when-mismatch nil
+(defvar backup-by-copying-when-mismatch nil
   "*Non-nil means create backups by copying if this preserves owner or group.
 Renaming may still be used (subject to control of other variables)
 when it would not result in changing the owner or group of the file;
@@ -99,24 +99,24 @@ This variable is relevant only if `backup-by-copying' is nil.")
   "Predicate that looks at a file name and decides whether to make backups.
 Called with an absolute file name as argument, it returns t to enable backup.")
 
-(defconst buffer-offer-save nil
+(defvar buffer-offer-save nil
   "*Non-nil in a buffer means offer to save the buffer on exit
 even if the buffer is not visiting a file.
 Automatically local in all buffers.")
 (make-variable-buffer-local 'buffer-offer-save)
 
-(defconst find-file-existing-other-name t
+(defvar find-file-existing-other-name t
   "*Non-nil means find a file under alternative names, in existing buffers.
 This means if any existing buffer is visiting the file you want
 under another name, you get the existing buffer instead of a new buffer.")
 
-(defconst find-file-visit-truename nil
+(defvar find-file-visit-truename nil
   "*Non-nil means visit a file under its truename.
 The truename of a file is found by chasing all links
 both at the file level and at the levels of the containing directories.")
 
-(defconst find-file-revert-without-query
-  '("/out$" "/traces/.*\.log$")
+(defvar find-file-revert-without-query
+  nil
   "*Specify which files should be reverted without query.
 The value is a list of regular expressions.
 If the file name matches one of these regular expressions,
@@ -134,7 +134,7 @@ If the buffer is visiting a new file, the value is nil.")
 (defvar buffer-file-numbers-unique (not (memq system-type '(windows-nt)))
   "Non-nil means that buffer-file-number uniquely identifies files.")
 
-(defconst file-precious-flag nil
+(defvar file-precious-flag nil
   "*Non-nil means protect against I/O errors while saving files.
 Some modes set this non-nil in particular buffers.
 
@@ -167,23 +167,23 @@ If nil, ask confirmation.  Any other value prevents any trimming.")
   "*Number of newest versions to keep when a new numbered backup is made.
 Includes the new backup.  Must be > 0")
 
-(defconst require-final-newline nil
+(defvar require-final-newline nil
   "*Value of t says silently ensure a file ends in a newline when it is saved.
 Non-nil but not t says ask user whether to add a newline when there isn't one.
 nil means don't add newlines.")
 
-(defconst auto-save-default t
+(defvar auto-save-default t
   "*Non-nil says by default do auto-saving of every file-visiting buffer.")
 
-(defconst auto-save-visited-file-name nil
+(defvar auto-save-visited-file-name nil
   "*Non-nil says auto-save a buffer in the file it is visiting, when practical.
 Normally auto-save files are written under other names.")
 
-(defconst save-abbrevs nil
+(defvar save-abbrevs nil
   "*Non-nil means save word abbrevs too when files are saved.
 Loading an abbrev file sets this to t.")
 
-(defconst find-file-run-dired t
+(defvar find-file-run-dired t
   "*Non-nil says run dired if `find-file' is given the name of a directory.")
 
 ;;;It is not useful to make this a local variable.
@@ -242,7 +242,7 @@ LOCAL argument.
 See also `write-file-hooks'.")
 (make-variable-buffer-local 'write-contents-hooks)
 
-(defconst enable-local-variables t
+(defvar enable-local-variables t
   "*Control use of local variables in files you visit.
 The value can be t, nil or something else.
 A value of t means file local variables specifications are obeyed;
@@ -251,7 +251,7 @@ nil means they are ignored; anything else means query.
 The command \\[normal-mode] always obeys file local variable
 specifications and ignores this variable.")
 
-(defconst enable-local-eval 'maybe
+(defvar enable-local-eval 'maybe
   "*Control processing of the \"variable\" `eval' in a file's local variables.
 The value can be t, nil or something else.
 A value of t means obey `eval' variables;
@@ -626,7 +626,7 @@ otherwise a string <2> or <3> or ... is appended to get an unused name."
 Choose the buffer's name using `generate-new-buffer-name'."
   (get-buffer-create (generate-new-buffer-name name)))
 
-(defconst automount-dir-prefix "^/tmp_mnt/"
+(defvar automount-dir-prefix "^/tmp_mnt/"
   "Regexp to match the automounter prefix in a directory name.")
 
 (defvar abbreviated-home-dir nil
@@ -1055,7 +1055,7 @@ If the element has the form (REGEXP FUNCTION NON-NIL), then after
 calling FUNCTION (if it's not nil), we delete the suffix that matched
 REGEXP and search the list again for another match.")
 
-(defconst interpreter-mode-alist
+(defvar interpreter-mode-alist
   '(("perl" . perl-mode)
     ("perl5" . perl-mode)
     ("wish" . tcl-mode)
@@ -1095,10 +1095,10 @@ The car of each element is compared with
 the name of the interpreter specified in the first line.
 If it matches, mode MODE is selected.")
 
-(defconst inhibit-first-line-modes-regexps '("\\.tar\\'" "\\.tgz\\'")
+(defvar inhibit-first-line-modes-regexps '("\\.tar\\'" "\\.tgz\\'")
   "List of regexps; if one matches a file name, don't look for `-*-'.")
 
-(defconst inhibit-first-line-modes-suffixes nil
+(defvar inhibit-first-line-modes-suffixes nil
   "List of regexps for what to ignore, for `inhibit-first-line-modes-regexps'.
 When checking `inhibit-first-line-modes-regexps', we first discard
 from the end of the file name anything that matches one of these regexps.")
@@ -1372,7 +1372,7 @@ in order to initialize other data structure based on them.")
 		(hack-one-local-variable var val)))))))
   (run-hooks 'hack-local-variables-hook))
 
-(defconst ignored-local-variables
+(defvar ignored-local-variables
   '(enable-local-eval)
   "Variables to be ignored in a file's local variable spec.")
 
@@ -2620,11 +2620,11 @@ by `sh' are supported."
     ;; not its part.  Make the regexp say so.
     (concat "\\`" result "\\'")))
 
-(defconst list-directory-brief-switches
+(defvar list-directory-brief-switches
   (if (eq system-type 'vax-vms) "" "-CF")
   "*Switches for list-directory to pass to `ls' for brief listing,")
 
-(defconst list-directory-verbose-switches
+(defvar list-directory-verbose-switches
   (if (eq system-type 'vax-vms)
       "/PROTECTION/SIZE/DATE/OWNER/WIDTH=(OWNER:10)"
     "-l")
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 327ec264cc8..60b85d7d2f2 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -105,7 +105,7 @@
 
 ;;; Some additional options and constants.
 
-(defconst search-exit-option t
+(defvar search-exit-option t
   "*Non-nil means random control characters terminate incremental search.")
 
 (defvar search-slow-window-lines 1
@@ -131,7 +131,7 @@ If this value is `not-yanks', yanked text is always downcased.")
 Actually, `isearch-edit-string' is called to let you enter the search
 string, and RET terminates editing and does a nonincremental search.")
 
-(defconst search-whitespace-regexp "\\s-+"
+(defvar search-whitespace-regexp "\\s-+"
   "*If non-nil, regular expression to match a sequence of whitespace chars.
 You might want to use something like \"[ \\t\\r\\n]+\" instead.")
 
@@ -151,9 +151,9 @@ You might want to use something like \"[ \\t\\r\\n]+\" instead.")
 (defvar regexp-search-ring nil
   "List of regular expression search string sequences.")
 
-(defconst search-ring-max 16
+(defvar search-ring-max 16
   "*Maximum length of search ring before oldest elements are thrown away.")
-(defconst regexp-search-ring-max 16
+(defvar regexp-search-ring-max 16
   "*Maximum length of regexp search ring before oldest elements are thrown away.")
 
 (defvar search-ring-yank-pointer nil
@@ -427,7 +427,7 @@ is treated as a regexp.  See \\[isearch-forward] for more info."
 ;; All the work is done by the isearch-mode commands.
 
 ;; Not used yet:
-;;(defconst isearch-commands '(isearch-forward isearch-backward
+;;(defvar isearch-commands '(isearch-forward isearch-backward
 ;;			     isearch-forward-regexp isearch-backward-regexp)
 ;;  "List of commands for which isearch-mode does not recursive-edit.")
 			     
diff --git a/lisp/startup.el b/lisp/startup.el
index 979f7106627..626bc9f1e08 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -118,12 +118,12 @@
 
 (defvar command-line-processed nil "t once command line has been processed")
 
-(defconst inhibit-startup-message nil
+(defvar inhibit-startup-message nil
   "*Non-nil inhibits the initial startup message.
 This is for use in your personal init file, once you are familiar
 with the contents of the startup message.")
 
-(defconst inhibit-startup-echo-area-message nil
+(defvar inhibit-startup-echo-area-message nil
   "*Non-nil inhibits the initial startup echo area message.
 Inhibition takes effect only if your `.emacs' file contains
 a line of this form:
@@ -133,10 +133,10 @@ If your `.emacs' file is byte-compiled, use the following form instead:
 Thus, someone else using a copy of your `.emacs' file will see
 the startup message unless he personally acts to inhibit it.")
 
-(defconst inhibit-default-init nil
+(defvar inhibit-default-init nil
   "*Non-nil inhibits loading the `default' library.")
 
-(defconst command-switch-alist nil
+(defvar command-switch-alist nil
   "Alist of command-line switches.
 Elements look like (SWITCH-STRING . HANDLER-FUNCTION).
 HANDLER-FUNCTION receives switch name as sole arg;
@@ -243,14 +243,17 @@ fashion analogous to the environment value TERM.")
 Emacs runs this hook after processing the command line arguments and loading
 the user's init file.")
 
-(defconst initial-major-mode 'lisp-interaction-mode
+(defvar initial-major-mode 'lisp-interaction-mode
   "Major mode command symbol to use for the initial *scratch* buffer.")
 
 (defvar init-file-user nil
   "Identity of user whose `.emacs' file is or was read.
-The value is nil if no init file is being used; otherwise, it may be either
-the null string, meaning that the init file was taken from the user that
-originally logged in, or it may be a string containing a user's name.
+The value is nil if `-q' or `--no-init-file' was specified,
+meaning do not load any init file.
+
+Otherwise, the value may be the null string, meaning use the init file
+for the user that originally logged in, or it may be a
+string containing a user's name meaning use that person's init file.
 
 In either of the latter cases, `(concat \"~\" init-file-user \"/\")'
 evaluates to the name of the directory where the `.emacs' file was
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index fd6db93ccd4..17237a4a235 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -28,17 +28,17 @@
 
 ;;; Code:
 
-(defconst fill-individual-varying-indent nil
+(defvar fill-individual-varying-indent nil
   "*Controls criterion for a new paragraph in `fill-individual-paragraphs'.
 Non-nil means changing indent doesn't end a paragraph.
 That mode can handle paragraphs with extra indentation on the first line,
 but it requires separator lines between paragraphs.
 A value of nil means that any change in indentation starts a new paragraph.")
 
-(defconst sentence-end-double-space t
+(defvar sentence-end-double-space t
   "*Non-nil means a single space does not end a sentence.")
 
-(defconst colon-double-space nil
+(defvar colon-double-space nil
   "*Non-nil means put two spaces after a colon when filling.")
 
 (defvar fill-paragraph-function nil
@@ -59,10 +59,10 @@ reinserts the fill prefix in each resulting line."
       (message "fill-prefix: \"%s\"" fill-prefix)
     (message "fill-prefix cancelled")))
 
-(defconst adaptive-fill-mode t
+(defvar adaptive-fill-mode t
   "*Non-nil means determine a paragraph's fill prefix from its text.")
 
-(defconst adaptive-fill-regexp "[ \t]*\\([#;>*]+ +\\)?"
+(defvar adaptive-fill-regexp "[ \t]*\\([#;>*]+ +\\)?"
   "*Regexp to match text at start of line that constitutes indentation.
 If Adaptive Fill mode is enabled, whatever text matches this pattern
 on the second line of a paragraph is used as the standard indentation
@@ -472,7 +472,7 @@ space does not end a sentence, so don't break a line there."
 	    (goto-char end)))))))
 
 
-(defconst default-justification 'left
+(defvar default-justification 'left
   "*Method of justifying text not otherwise specified.
 Possible values are `left', `right', `full', `center', or `none'.
 The requested kind of justification is done whenever lines are filled.
diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index 775f0ea72a9..7948723d963 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -85,7 +85,7 @@ to paragraphs.  The fill functions insert and delete only soft newlines."
 			       (point) (1+ (point))))))))))))
     (setq use-hard-newlines t)))
 
-(defconst paragraph-start "[ \t\n\f]" "\
+(defvar paragraph-start "[ \t\n\f]" "\
 *Regexp for beginning of a line that starts OR separates paragraphs.
 This regexp should match lines that separate paragraphs
 and should also match lines that start a paragraph
@@ -108,7 +108,7 @@ hard newline are considered to match.")
 ;; something very minimal, even including "." (which makes every hard newline
 ;; start a new paragraph).
 
-(defconst paragraph-separate "[ \t\f]*$" "\
+(defvar paragraph-separate "[ \t\f]*$" "\
 *Regexp for beginning of a line that separates paragraphs.
 If you change this, you may have to change paragraph-start also.
 
@@ -117,7 +117,7 @@ the beginning of the line, so it should not use \"^\" as an anchor.  This
 ensures that the paragraph functions will work equally within a region of
 text indented by a margin setting.")
 
-(defconst sentence-end (purecopy "[.?!][]\"')}]*\\($\\| $\\|\t\\|  \\)[ \t\n]*") "\
+(defvar sentence-end (purecopy "[.?!][]\"')}]*\\($\\| $\\|\t\\|  \\)[ \t\n]*") "\
 *Regexp describing the end of a sentence.
 All paragraph boundaries also end sentences, regardless.
 
@@ -125,7 +125,7 @@ In order to be recognized as the end of a sentence, the ending period,
 question mark, or exclamation point must be followed by two spaces,
 unless it's inside some sort of quotes or parenthesis.")
 
-(defconst page-delimiter "^\014" "\
+(defvar page-delimiter "^\014" "\
 *Regexp describing line-beginnings that separate pages.")
 
 (defvar paragraph-ignore-fill-prefix nil "\