Changeset 4018 for vendor/emacs-CVS_HEAD/lisp/font-lock.el

Timestamp:

01/28/06 09:46:44 (3 years ago)

Author:

miyoshi

Message:

Update.

Files:

• vendor/emacs-CVS_HEAD/lisp/font-lock.el (modified) (24 diffs)

vendor/emacs-CVS_HEAD/lisp/font-lock.el

@@ -2 +2 @@
-
-;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- 2005
+, 2005, 2006 
-
-;; Author: jwz, then rms, then sm
@@ -154 +154 @@
-;;  (add-hook 'foo-mode-hook
-;;   (lambda ()
-
-(setq font-lock-defaults
+set (
+    
-
-;;; Adding Font Lock support for modes:
@@ -175 +175 @@
-;; and within `bar-mode' there could be:
-;;
-
-(setq font-lock-defaults
+set (
+    
-
-;; What is fontification for?  You might say, "It's to make my code look nice."
@@ -213 +213 @@
-(defgroup font-lock '((jit-lock custom-group))
-  "Font Lock mode text highlighting package."
-
-
+:tag "Emacs Manual" 
+:tag "Elisp Manual" 
-  :group 'faces)
-
@@ -464 +464 @@
-  "Alist of additional `font-lock-keywords' elements for major modes.
-
-APPEND
+HOW
-`font-lock-set-defaults' adds the elements in the list KEYWORDS to
-`font-lock-keywords' when Font Lock is turned on in major mode MODE.
-
-APPEND
+HOW
-`font-lock-keywords'.  If it is `set', they are used to replace the
-APPEND
+HOW
-they are added at the end.
-
@@ -651 +651 @@
-    (font-lock-turn-off-thing-lock)))
-
-append
+how
-  "Add highlighting KEYWORDS for MODE.
-
@@ -658 +658 @@
-KEYWORDS should be a list; see the variable `font-lock-keywords'.
-By default they are added at the beginning of the current highlighting list.
-APPEND
-APPEND
+HOW
+HOW
-end of the current highlighting list.
-
@@ -692 +692 @@
-`objc-font-lock-extra-types' and `java-font-lock-extra-types'."
-  (cond (mode
-APPEND
+HOW
-         ;; `font-lock-keywords-alist' so `font-lock-set-defaults' uses them.
-append
+how
-           (if (setq cell (assq mode font-lock-keywords-alist))
-append
+how
-                   (setcdr cell (list spec))
-                 (setcdr cell (append (cdr cell) (list spec))))
@@ -702 +702 @@
-         ;; Make sure that `font-lock-removed-keywords-alist' does not
-         ;; contain the new keywords.
-append
+how
-        (t
-         ;; Otherwise set or add the keywords now.
@@ -713 +713 @@
-               (setq font-lock-keywords (cadr font-lock-keywords)))
-           ;; Now modify or replace them.
-append
+how
-               (setq font-lock-keywords keywords)
-             (font-lock-remove-keywords nil keywords) ;to avoid duplicates
@@ -719 +719 @@
-                            (cdr font-lock-keywords)
-                          font-lock-keywords)))
-append
+how
-                                            (append old keywords)
-                                          (append keywords old)))))
-           ;; If the keywords were compiled before, compile them again.
-           (if was-compiled
- (make-local-variable 'font-lock-keywords)
-               
-
-append
+q font-lock-keywords
+                 
+
+how
-  "Update `font-lock-removed-keywords-alist' when adding new KEYWORDS to MODE."
-  ;; When font-lock is enabled first all keywords in the list
@@ -737 +737 @@
-  (let ((cell (assq mode font-lock-removed-keywords-alist)))
-    (if cell
-append
+how
-            ;; A new set of keywords is defined.  Forget all about
-            ;; our old keywords that should be removed.
@@ -787 +787 @@
-             ;; `font-lock-keywords-alist'.
-             (when top-cell
-append
-append
-append
+how
+how
+how
-                 ;; argument in the cdr top-cell.
-append
-append
-append
-append
+how
+how
+how
+how
-               ;; should be deleted then previously deleted keywords
-               ;; would appear again.)
@@ -831 +831 @@
-           ;; If the keywords were compiled before, compile them again.
-           (if was-compiled
- (make-local-variable 'font-lock-keywords)
-               
+q font-lock-keywords
+                 
-
-;;; Font Lock Support mode.
@@ -981 +981 @@
-  "Fontify the current buffer the way the function `font-lock-mode' would."
-  (interactive)
+  (font-lock-set-defaults)
-  (let ((font-lock-verbose (or font-lock-verbose (interactive-p))))
-    (funcall font-lock-fontify-buffer-function)))
@@ -988 +989 @@
-
-(defun font-lock-fontify-region (beg end &optional loudly)
+  (font-lock-set-defaults)
-  (funcall font-lock-fontify-region-function beg end loudly))
-
@@ -1001 +1003 @@
-        (when verbose
-          (format "Fontifying %s..." (buffer-name)))
-      ;; Make sure we have the right `font-lock-keywords' etc.
-      (unless font-lock-mode
-        (font-lock-set-defaults))
-      ;; Make sure we fontify etc. in the whole buffer.
-      (save-restriction
@@ -1124 +1123 @@
-          ((error quit) (message "Fontifying block...%s" error-data)))))))
-
-
-
+
+
+
-
-;;; End of Fontification functions.
@@ -1508 +1508 @@
-If REGEXP is non-nil, it means these keywords are used for
-`font-lock-keywords' rather than for `font-lock-syntactic-keywords'."
+  (if (not font-lock-set-defaults)
+      ;; This should never happen.  But some external packages sometimes
+      ;; call font-lock in unexpected and incorrect ways.  It's important to
+      ;; stop processing at this point, otherwise we may end up changing the
+      ;; global value of font-lock-keywords and break highlighting in many
+      ;; other buffers.
+      (error "Font-lock trying to use keywords before setting them up"))
-  (if (eq (car-safe keywords) t)
-      keywords
@@ -1574 +1581 @@
-         keywords)
-        ((numberp level)
-reverse
+last
-        ((eq level t)
-reverse
+last
-        (t
-         (car keywords))))
@@ -1642 +1649 @@
-      ;; Now compile the keywords.
-      (unless (eq (car font-lock-keywords) t)
- (make-local-variable 'font-lock-keywords)
-       
+q font-lock-keywords
+         
-
-;;; Colour etc. support.
@@ -1957 +1964 @@
-            (goto-char (match-end 2)))
-        (error t)))))
+
+;; C preprocessor(cpp) is used outside of C, C++ and Objective-C source file.
+;; e.g. assembler code and GNU linker script in Linux kernel.
+;; `cpp-font-lock-keywords' is handy for modes for the files.
+;;
+;; Here we cannot use `regexp-opt' because because regex-opt is not preloaded
+;; while font-lock.el is preloaded to emacs. So values pre-calculated with 
+;; regexp-opt are used here.
+
+;; `cpp-font-lock-keywords-source-directives' is calculated from:
+;;
+;;          (regexp-opt
+;;           '("define"  "elif" "else" "endif" "error" "file" "if" "ifdef"
+;;             "ifndef" "include" "line" "pragma" "undef"))
+;;
+(defconst cpp-font-lock-keywords-source-directives
+  "define\\|e\\(?:l\\(?:if\\|se\\)\\|ndif\\|rror\\)\\|file\\|i\\(?:f\\(?:n?def\\)?\\|nclude\\)\\|line\\|pragma\\|undef"
+  "Regular expressoin used in `cpp-font-lock-keywords'.")
+
+;; `cpp-font-lock-keywords-source-depth' is calculated from:
+;;
+;;          (regexp-opt-depth (regexp-opt
+;;                     '("define"  "elif" "else" "endif" "error" "file" "if" "ifdef"
+;;                       "ifndef" "include" "line" "pragma" "undef")))
+;;
+(defconst cpp-font-lock-keywords-source-depth 0
+  "An integer representing regular expression depth of `cpp-font-lock-keywords-source-directives'.
+Used in `cpp-font-lock-keywords'.")
+
+(defconst cpp-font-lock-keywords
+  (let* ((directives cpp-font-lock-keywords-source-directives)
+         (directives-depth cpp-font-lock-keywords-source-depth))
+    (list
+     ;;
+     ;; Fontify error directives.
+     '("^#[ \t]*error[ \t]+\\(.+\\)" 1 font-lock-warning-face prepend)
+     ;;
+     ;; Fontify filenames in #include <...> preprocessor directives as strings.
+     '("^#[ \t]*\\(?:import\\|include\\)[ \t]*\\(<[^>\"\n]*>?\\)"
+       1 font-lock-string-face prepend)
+     ;;
+     ;; Fontify function macro names.
+     '("^#[ \t]*define[ \t]+\\([[:alpha:]_][[:alnum:]_$]*\\)(" 
+       (1 font-lock-function-name-face prepend)
+       ;;
+       ;; Macro arguments.
+       ((lambda (limit)
+          (re-search-forward
+           "\\(?:\\([[:alpha:]_][[:alnum:]_]*\\)[,]?\\)" 
+           (or (save-excursion (re-search-forward ")" limit t)) 
+               limit)
+           t)) 
+        nil nil (1 font-lock-variable-name-face prepend)))
+     ;;
+     ;; Fontify symbol names in #elif or #if ... defined preprocessor directives.
+     '("^#[ \t]*\\(?:elif\\|if\\)\\>"
+       ("\\<\\(defined\\)\\>[ \t]*(?\\([[:alpha:]_][[:alnum:]_]*\\)?" nil nil
+        (1 font-lock-builtin-face prepend) (2 font-lock-variable-name-face prepend t)))
+     ;;
+     ;; Fontify otherwise as symbol names, and the preprocessor directive names.
+     (list
+      (concat "^\\(#[ \t]*\\(?:" directives
+              "\\)\\)\\>[ \t!]*\\([[:alpha:]_][[:alnum:]_]*\\)?")
+      '(1 font-lock-preprocessor-face prepend)
+      (list (+ 2 directives-depth)
+            'font-lock-variable-name-face nil t))))
+    "Font lock keyords for C preprocessor directives.
+`c-mode', `c++-mode' and `objc-mode' have their own 
+font lock keyords for C preprocessor directives. This definition is for the
+other modes in which C preprocessor directives are used. e.g. `asm-mode' and
+`ld-script-mode'.")
+
-
-;; Lisp.
@@ -1965 +2044 @@
-      (,(concat "(\\(def\\("
-                ;; Function declarations.
-varalias\\|
+
-                "setf\\|subst\\*?\\|un\\*?\\|"
-
+
+
-                "method-combination\\|setf-expander\\|skeleton\\|widget\\|"
-                "function\\|\\(compiler\\|modify\\|symbol\\)-macro\\)\\)\\|"
-                ;; Variable declarations.
-
+varalias\\|
-                ;; Structure declarations.
-                "\\(class\\|group\\|theme\\|package\\|struct\\|type\\)"
@@ -2047 +2127 @@
-       ("\\<:\\sw+\\>" 0 font-lock-builtin-face)
-       ;; ELisp and CLisp `&' keywords as types.
-
+<\\
-       ;; ELisp regexp grouping constructs
-       ((lambda (bound)