(c-style-alist, c-lang-variable-inits, c-lang-variable-inits-tail): The

values of these are changed, so declare them as variables and not constants.

diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 4048537458fd18adc80097267d8c866ab3e21843..6bf2cc71ed28292332067bf365ae71b6b5d75828 100644 (file)
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -131,8 +131,10 @@
   ;; These are used to collect the init forms from the subsequent
   ;; `c-lang-defvar'.  They are used to build the lambda in
   ;; `c-make-init-lang-vars-fun' below.
-  (defconst c-lang-variable-inits (list nil))
-  (defconst c-lang-variable-inits-tail c-lang-variable-inits))
+  (defvar c-lang-variable-inits nil)
+  (defvar c-lang-variable-inits-tail nil)
+  (setq c-lang-variable-inits (list nil)
+       c-lang-variable-inits-tail c-lang-variable-inits))
 
 (defmacro c-lang-defvar (var val &optional doc)
   "Declares the buffer local variable VAR to get the value VAL at mode

diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el
index 5cef42ed80171b7b9ad99ec6d746bce450e1b25b..4fb3656b6c0196199836a2f18b6284d78dd84fb2 100644 (file)
--- a/lisp/progmodes/cc-styles.el
+++ b/lisp/progmodes/cc-styles.el
@@ -50,8 +50,7 @@
 (cc-bytecomp-defvar adaptive-fill-first-line-regexp) ; Emacs
 
 \f
-;; Warning: don't eval-defun this constant or you'll break style inheritance.
-(defconst c-style-alist
+(defvar c-style-alist
   '(("gnu"
      (c-basic-offset . 2)
      (c-comment-only-line-offset . (0 . 0))