Changeset 4166 for trunk/lisp/font-lock.el

Timestamp:

09/18/06 20:48:14 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/font-lock.el (modified) (7 diffs)

trunk/lisp/font-lock.el

@@ -719 +719 @@
-           (if was-compiled
-               (setq font-lock-keywords
- t
+
-
-(defun font-lock-update-removed-keyword-alist (mode keywords how)
@@ -826 +826 @@
-           (if was-compiled
-               (setq font-lock-keywords
- t
+
-
-;;; Font Lock Support mode.
@@ -1415 +1415 @@
-  (unless (eq (car font-lock-syntactic-keywords) t)
-    (setq font-lock-syntactic-keywords (font-lock-compile-keywords
-
+
+
-  ;; Get down to business.
-  (let ((case-fold-search font-lock-keywords-case-fold-search)
@@ -1571 +1572 @@
-  (unless (eq (car font-lock-keywords) t)
-    (setq font-lock-keywords
- t
+
-  (let ((case-fold-search font-lock-keywords-case-fold-search)
-        (keywords (cddr font-lock-keywords))
@@ -1627 +1628 @@
-;; Various functions.
-
-regexp
+syntactic-keywords
-  "Compile KEYWORDS into the form (t KEYWORDS COMPILED...)
-Here each COMPILED is of the form (MATCHER HIGHLIGHT ...) as shown in the
-`font-lock-keywords' doc string.
-REGEXP
-keywords' rather than for `font-lock-syntactic
+SYNTACTIC-KEYWORDS
+syntactic-keywords' rather than for `font-lock
-  (if (not font-lock-set-defaults)
-      ;; This should never happen.  But some external packages sometimes
@@ -1645 +1646 @@
-          (cons t (cons keywords
-                        (mapcar 'font-lock-compile-keyword keywords))))
-regexp
+(not syntactic-keywords)
-             (eq (or syntax-begin-function
-                     font-lock-beginning-of-syntax-function)
@@ -1775 +1776 @@
-      (unless (eq (car font-lock-keywords) t)
-        (setq font-lock-keywords
- t
+
-
-;;; Colour etc. support.