summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stjernholm <mast@lysator.liu.se>2003-07-05 19:54:33 +0000
committerMartin Stjernholm <mast@lysator.liu.se>2003-07-05 19:54:33 +0000
commitb7c4644f0bcabc8c3814f2f39f73d692788ee914 (patch)
treeb5c177ca117659dabf191512ed5364a444c654b0
parentfeb5176b8d8c3faf9efe714f6b3c6cfcf4812dbc (diff)
downloademacs-b7c4644f0bcabc8c3814f2f39f73d692788ee914.tar.gz
(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.
-rw-r--r--lisp/progmodes/cc-langs.el6
-rw-r--r--lisp/progmodes/cc-styles.el3
2 files changed, 5 insertions, 4 deletions
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))