3 files changed, 17 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3c348071fda..f427ca3c9a1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2007-12-18  Thien-Thi Nguyen  <ttn@gnuvola.org>
+
+        * progmodes/cc-vars.el (defcustom-c-stylevar): Eval VAL.
+        (c-comment-continuation-stars): No longer declare with
+        cc-bytecomp-obsolete-var and cc-bytecomp-defvar.
+        (c-block-comment-prefix): Use symbol-value to
+        access c-comment-continuation-stars.
+        * progmodes/cc-mode.el (c-initialize-cc-mode):
+        Use symbol-value to access c-comment-continuation-stars.
+
 2007-12-18  Mark A. Hershberger  <mah@everybody.org>
 
         * xml.el (xml-escape-string): New function.  Escape string using
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 00ec64a85a0..711fa02b2f4 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -190,7 +190,8 @@ control).  See \"cc-mode.el\" for more info."
             (run-hooks 'c-initialization-hook)
             ;; Fix obsolete variables.
             (if (boundp 'c-comment-continuation-stars)
-                (setq c-block-comment-prefix c-comment-continuation-stars))
+                (setq c-block-comment-prefix
+                      (symbol-value 'c-comment-continuation-stars)))
             (add-hook 'change-major-mode-hook 'c-leave-cc-mode-mode)
             (setq c-initialization-ok t))
         ;; Will try initialization hooks again if they failed.
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index c071569d694..6110ab2250f 100644
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -183,7 +183,7 @@ the value set here overrides the style system (there is a variable
          (newt (append (unless (plist-get tail :tag)
                          '(:tag "Override style settings"))
                        (unless (plist-get tail :value)
-                         `(:value ,val))
+                         `(:value ,(eval val)))
                        tail))
          (aggregate `'(radio
                        (const :tag "Use style settings" set-from-style)
@@ -440,12 +440,13 @@ comment-only lines."
 ;; Although c-comment-continuation-stars is obsolete, we look at it in
 ;; some places in CC Mode anyway, so make the compiler ignore it
 ;; during our compilation.
-(cc-bytecomp-obsolete-var c-comment-continuation-stars)
-(cc-bytecomp-defvar c-comment-continuation-stars)
+;; [This is unclean; better to use `symbol-value'. --ttn]
+;;(cc-bytecomp-obsolete-var c-comment-continuation-stars)
+;;(cc-bytecomp-defvar c-comment-continuation-stars)
 
 (defcustom-c-stylevar c-block-comment-prefix
   (if (boundp 'c-comment-continuation-stars)
-      c-comment-continuation-stars
+      (symbol-value 'c-comment-continuation-stars)
     "* ")
   "*Specifies the line prefix of continued C-style block comments.
 You should set this variable to the literal string that gets inserted