Avoid `defconst` for vars which we modify

If we `setq` or let-bind a var, then presumably it's not a const.

* lisp/bookmark.el (bookmark-bmenu-buffer):
* lisp/char-fold.el (char-fold-table):
* lisp/pcmpl-linux.el (pcmpl-linux-fs-modules-path-format)
(pcmpl-linux-mtab-file):
* lisp/emacs-lisp/bytecomp.el (byte-compile-log-buffer):
* lisp/emacs-lisp/check-declare.el (check-declare-warning-buffer):
* lisp/emacs-lisp/ert-x.el (ert-remote-temporary-file-directory):
* lisp/erc/erc.el (erc-default-port):
* lisp/net/tramp.el (tramp-unknown-id-string)
(tramp-unknown-id-integer):
* lisp/url/url-util.el (url-unreserved-chars):

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 893fdffb7ceebcbacc81356aa5b7a82ba406a6c1..60dd61a5ac87bbdea40d9f8181191ca3c6e01053 100644 (file)
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -142,7 +142,7 @@ Nil means don't prompt for confirmation."
   "Non-nil means show annotations when jumping to a bookmark."
   :type 'boolean)
 
-(defconst bookmark-bmenu-buffer "*Bookmark List*"
+(defvar bookmark-bmenu-buffer "*Bookmark List*"
   "Name of buffer used for Bookmark List.")
 
 (defvar bookmark-bmenu-use-header-line t

diff --git a/lisp/char-fold.el b/lisp/char-fold.el
index a620d4d8dc300b400337676e845d05827f6ce2e1..4d9644216d80a660969dbf50f38402d76ca9cb31 100644 (file)
--- a/lisp/char-fold.el
+++ b/lisp/char-fold.el
@@ -214,7 +214,7 @@
          equiv))
       equiv)))
 
-(defconst char-fold-table
+(defvar char-fold-table
   (eval-when-compile
     (char-fold--make-table))
   "Used for folding characters of the same group during search.

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 1ef3f0fba6d6ec068392af5f5fab20f4421b116d..e940a135e519ff15680eb72ace6f7621343cf357 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -262,7 +262,7 @@ This option is enabled by default because it reduces Emacs memory usage."
   :type 'boolean)
 ;;;###autoload(put 'byte-compile-dynamic-docstrings 'safe-local-variable 'booleanp)
 
-(defconst byte-compile-log-buffer "*Compile-Log*"
+(defvar byte-compile-log-buffer "*Compile-Log*"
   "Name of the byte-compiler's log buffer.")
 
 (defvar byte-compile--known-dynamic-vars nil
@@ -1874,7 +1874,7 @@ It is too wide if it has any lines longer than the largest of
          (setq byte-to-native-plist-environment
                overriding-plist-environment)))))
 
-(defmacro displaying-byte-compile-warnings (&rest body)
+(defmacro displaying-byte-compile-warnings (&rest body) ;FIXME: namespace!
   (declare (debug (def-body)))
   `(bytecomp--displaying-warnings (lambda () ,@body)))
 

diff --git a/lisp/emacs-lisp/check-declare.el b/lisp/emacs-lisp/check-declare.el
index 0362c7d2c247d9889c8f645a98f199eb562569ea..8e40b227b65350f576f04fce20c4272cb53e0e02 100644 (file)
--- a/lisp/emacs-lisp/check-declare.el
+++ b/lisp/emacs-lisp/check-declare.el
@@ -40,7 +40,7 @@
 
 ;;; Code:
 
-(defconst check-declare-warning-buffer "*Check Declarations Warnings*"
+(defvar check-declare-warning-buffer "*Check Declarations Warnings*"
   "Name of buffer used to display any `check-declare' warnings.")
 
 (defun check-declare-locate (file basefile)

diff --git a/lisp/emacs-lisp/ert-x.el b/lisp/emacs-lisp/ert-x.el
index 05da0f1844eddaf9ecbd3ccfb54e56dcc9df6d49..a6d2fe4a1daaa14254aa9142ebf5ab03727931fe 100644 (file)
--- a/lisp/emacs-lisp/ert-x.el
+++ b/lisp/emacs-lisp/ert-x.el
@@ -543,7 +543,7 @@ The same keyword arguments are supported as in
 ;; If this defconst is used in a test file, `tramp' shall be loaded
 ;; prior `ert-x'.  There is no default value on w32 systems, which
 ;; could work out of the box.
-(defconst ert-remote-temporary-file-directory
+(defvar ert-remote-temporary-file-directory
   (when (featurep 'tramp)
     (cond
      ((getenv "REMOTE_TEMPORARY_FILE_DIRECTORY"))

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 0565440f3579d600ae60c9e5444b30ddd7a5ff1f..e639a6278fca0581f0fbc6c4f33e426f5474c40b 100644 (file)
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -1691,7 +1691,7 @@ Defaults to the server buffer."
 (defconst erc-default-server "irc.libera.chat"
   "IRC server to use if it cannot be detected otherwise.")
 
-(defconst erc-default-port 6667
+(defvar erc-default-port 6667
   "IRC port to use if it cannot be detected otherwise.")
 
 (defconst erc-default-port-tls 6697

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 2f6b526039f838a0d211dd908fe1ed316765a758..ad36dd53a327cf3eeb2caeeb044848d19fd014a0 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1085,10 +1085,10 @@ Derived from `tramp-postfix-host-format'.")
 (defconst tramp-localname-regexp (rx (* (not (any "\r\n"))) eos)
   "Regexp matching localnames.")
 
-(defconst tramp-unknown-id-string "UNKNOWN"
+(defvar tramp-unknown-id-string "UNKNOWN"
   "String used to denote an unknown user or group.")
 
-(defconst tramp-unknown-id-integer -1
+(defvar tramp-unknown-id-integer -1
   "Integer used to denote an unknown user or group.")
 
 ;;;###tramp-autoload
@@ -2081,7 +2081,7 @@ without a visible progress reporter."
 (defmacro with-tramp-timeout (list &rest body)
   "Like `with-timeout', but allow SECONDS to be nil.
 
-(fn (SECONDS TIMEOUT-FORMS...) BODY)"
+\(fn (SECONDS TIMEOUT-FORMS...) BODY)"
   (declare (indent 1) (debug ((form body) body)))
   (let ((seconds (car list))
        (timeout-forms (cdr list)))

diff --git a/lisp/pcmpl-linux.el b/lisp/pcmpl-linux.el
index 3aee0b296f6a90eb124a6c7b8578fbc4fe9b9e11..d0defc541742ee8e35fa6e5f7b1a7a7a46071eab 100644 (file)
--- a/lisp/pcmpl-linux.el
+++ b/lisp/pcmpl-linux.el
@@ -61,7 +61,7 @@
   (pcomplete-opt "hVanfFrsvwt(pcmpl-linux-fs-types)o?L?U?")
   (while (pcomplete-here (pcomplete-entries) nil #'identity)))
 
-(defconst pcmpl-linux-fs-modules-path-format "/lib/modules/%s/kernel/fs/")
+(defvar pcmpl-linux-fs-modules-path-format "/lib/modules/%s/kernel/fs/")
 
 (defun pcmpl-linux-fs-types ()
   "Return a list of available fs modules on GNU/Linux systems."
@@ -69,7 +69,7 @@
     (directory-files
      (format pcmpl-linux-fs-modules-path-format kernel-ver))))
 
-(defconst pcmpl-linux-mtab-file "/etc/mtab")
+(defvar pcmpl-linux-mtab-file "/etc/mtab")
 
 (defun pcmpl-linux-mounted-directories ()
   "Return a list of mounted directory names."

diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el
index 28d1885387d5f61eed94582a1eff3e12ac7671c3..5f45b98c7a5c0a59176b7093e7c84497cfdaf66c 100644 (file)
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -335,7 +335,7 @@ appropriate coding-system; see `decode-coding-string'."
              str (substring str (match-end 0)))))
     (concat tmp str)))
 
-(defconst url-unreserved-chars
+(defvar url-unreserved-chars
   '(?a ?b ?c ?d ?e ?f ?g ?h ?i ?j ?k ?l ?m ?n ?o ?p ?q ?r ?s ?t ?u ?v ?w ?x ?y ?z
     ?A ?B ?C ?D ?E ?F ?G ?H ?I ?J ?K ?L ?M ?N ?O ?P ?Q ?R ?S ?T ?U ?V ?W ?X ?Y ?Z
     ?0 ?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9