Changeset 4131 for trunk/lisp/progmodes/cc-langs.el

Timestamp:

07/29/06 07:48:34 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/progmodes/cc-langs.el (modified) (11 diffs)

trunk/lisp/progmodes/cc-langs.el

@@ -135 +135 @@
-(eval-and-compile
-  ;; These are used to collect the init forms from the subsequent
-
-
+
+
+
+
-  (defvar c-lang-variable-inits nil)
-  (defvar c-lang-variable-inits-tail nil)
-  (setq c-lang-variable-inits (list nil)
-
+
+
+
+
+
-
-(defmacro c-lang-defvar (var val &optional doc)
@@ -169 +175 @@
-      (setcdr c-lang-variable-inits-tail (list (list var val doc)))
-      (setq c-lang-variable-inits-tail (cdr c-lang-variable-inits-tail))))
+
+  ;; Return the symbol, like the other def* forms.
+  `',var)
+
+(defmacro c-lang-setvar (var val)
+  "Causes the variable VAR to be made buffer local and to get set to the
+value VAL.  VAL is evaluated and assigned at mode initialization.  More
+precisely, VAL is evaluated and bound to VAR when the result from the
+macro `c-init-language-vars' is evaluated.  VAR is typically a standard
+Emacs variable like `comment-start'.
+
+`c-lang-const' is typically used in VAL to get the right value for the
+language being initialized, and such calls will be macro expanded to
+the evaluated constant value at compile time."
+  (let ((elem (assq var (cdr c-emacs-variable-inits))))
+    (if elem
+        (setcdr elem (list val)) ; Maybe remove "list", sometime. 2006-07-19
+      (setcdr c-emacs-variable-inits-tail (list (list var val)))
+      (setq c-emacs-variable-inits-tail (cdr c-emacs-variable-inits-tail))))
-
-  ;; Return the symbol, like the other def* forms.
@@ -1104 +1129 @@
-  ;; comments aren't entirely portable.
-  c "/* ")
-
-
+
-
-(c-lang-defconst comment-end
@@ -1118 +1142 @@
-        (concat " " (c-lang-const c-block-comment-ender))
-      ""))
-
-
+
-
-(c-lang-defconst comment-start-skip
@@ -1135 +1158 @@
-             "\\|")
-            "\\)\\s *"))
-
-
+
-
-(c-lang-defconst c-syntactic-ws-start
@@ -2807 +2829 @@
-
-;; Compile in the list of language variables that has been collected
-macro.  Note that the first element is
-
+and `c-lang-setvar' macros.  Note that the
+first element of each is 
-(defconst c-lang-variable-inits (cc-eval-when-compile c-lang-variable-inits))
+(defconst c-emacs-variable-inits (cc-eval-when-compile c-emacs-variable-inits))
-
-(defun c-make-init-lang-vars-fun (mode)
@@ -2842 +2865 @@
-                             ;; constant immediately in `cl-macroexpand-all'
-                             ;; below.
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-                 ;; This diagnostic message isn't useful for end
@@ -2860 +2887 @@
-                 (require 'cc-langs)
-                 (setq source-eval t)
-
+
+
-                   (while init
-                     (setq current-var (caar init))
@@ -2868 +2896 @@
-             (error
-              (if current-var
-
+or `c-lang-setvar' 
-                           current-var
-                           (if source-eval
@@ -2884 +2912 @@
-       (require 'cc-langs)
-       (let ((c-buffer-is-cc-mode ',mode)
-
+
+
-             current-var)
-         (condition-case err
@@ -2896 +2925 @@
-            (if current-var
-                (message
-
+or `c-lang-setver' 
-                 current-var err)
-              (signal (car err) (cdr err)))))))