(c-constant-symbol): Put this defun inside an eval-and-compile, so as to

permit byte-compiling (e.g. in bootstrap).

diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index 6ba2281f344fa7e5c5f2d7e5f46339e21e2bb189..7596dc60b5f26c6fd4cd3d3ec71bf74c246a1724 100644 (file)
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -74,22 +74,23 @@ Useful as last item in a `choice' widget."
       :value 'other))
 
 ;; The next defun will supersede c-const-symbol.
-(defun c-constant-symbol (sym len)
-  "Create an uneditable symbol for customization buffers.
+(eval-and-compile
+  (defun c-constant-symbol (sym len)
+    "Create an uneditable symbol for customization buffers.
 SYM is the name of the symbol, LEN the length of the field (in
 characters) the symbol will be displayed in.  LEN must be big
 enough.
 
 This returns a (const ....) structure, suitable for embedding
 within a customization type."
-  (or (symbolp sym) (error "c-constant-symbol: %s is not a symbol" sym))
-  (let* ((name (symbol-name sym))
-        (l (length name))
-        (disp (concat name ":" (make-string (- len l 1) ?\ ))))
-    `(const
-      :size ,len
-      :format ,disp
-      :value ,sym)))
+    (or (symbolp sym) (error "c-constant-symbol: %s is not a symbol" sym))
+    (let* ((name (symbol-name sym))
+          (l (length name))
+          (disp (concat name ":" (make-string (- len l 1) ?\ ))))
+      `(const
+       :size ,len
+       :format ,disp
+       :value ,sym))))
 
 (define-widget 'c-const-symbol 'item
   "An uneditable lisp symbol.  This is obsolete -