From: Martin Stjernholm <mast@lysator.liu.se>
Date: Sat, 5 Jul 2003 19:54:33 +0000 (+0000)
Subject: (c-style-alist, c-lang-variable-inits, c-lang-variable-inits-tail): The
X-Git-Tag: ttn-vms-21-2-B4~9490
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2eb455ab3248b90c588ec8e87b6e0313c3b80d45;p=emacs.git

(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 4048537458f..6bf2cc71ed2 100644
--- 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 5cef42ed801..4fb3656b6c0 100644
--- 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
 
 
-;; 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))