[Emacs-diffs] Changes to emacs/lisp/font-lock.el

[Richard M . Stallman]

Index: emacs/lisp/font-lock.el
diff -c emacs/lisp/font-lock.el:1.223 emacs/lisp/font-lock.el:1.224
*** emacs/lisp/font-lock.el:1.223       Mon Jun 28 02:45:01 2004
--- emacs/lisp/font-lock.el     Sat Jul 17 14:30:33 2004
***************
*** 693,699 ****
           ;; If the keywords were compiled before, compile them again.
           (if was-compiled
               (set (make-local-variable 'font-lock-keywords)
!                   (font-lock-compile-keywords keywords t)))))))
  
  (defun font-lock-update-removed-keyword-alist (mode keywords append)
    ;; Update `font-lock-removed-keywords-alist' when adding new
--- 693,699 ----
           ;; If the keywords were compiled before, compile them again.
           (if was-compiled
               (set (make-local-variable 'font-lock-keywords)
!                   (font-lock-compile-keywords font-lock-keywords t)))))))
  
  (defun font-lock-update-removed-keyword-alist (mode keywords append)
    ;; Update `font-lock-removed-keywords-alist' when adding new
***************
*** 801,807 ****
           ;; If the keywords were compiled before, compile them again.
           (if was-compiled
               (set (make-local-variable 'font-lock-keywords)
!                   (font-lock-compile-keywords keywords t)))))))
  
  ;;; Font Lock Support mode.
  
--- 801,807 ----
           ;; If the keywords were compiled before, compile them again.
           (if was-compiled
               (set (make-local-variable 'font-lock-keywords)
!                   (font-lock-compile-keywords font-lock-keywords t)))))))
  
  ;;; Font Lock Support mode.
  
***************
*** 1944,1955 ****
                  '("when" "unless" "case" "ecase" "typecase" "etypecase"
                    "ccase" "ctypecase" "handler-case" "handler-bind"
                    "restart-bind" "restart-case" "in-package"
!                   "cerror" "break" "ignore-errors"
                    "loop" "do" "do*" "dotimes" "dolist" "the" "locally"
                    "proclaim" "declaim" "declare" "symbol-macrolet"
                    "lexical-let" "lexical-let*" "flet" "labels" "compiler-let"
!                   "destructuring-bind" "macrolet" "tagbody" "block"
!                   "multiple-value-bind"
                    "return" "return-from"
                    "with-accessors" "with-compilation-unit"
                    "with-condition-restarts" "with-hash-table-iterator"
--- 1944,1955 ----
                  '("when" "unless" "case" "ecase" "typecase" "etypecase"
                    "ccase" "ctypecase" "handler-case" "handler-bind"
                    "restart-bind" "restart-case" "in-package"
!                   "break" "ignore-errors"
                    "loop" "do" "do*" "dotimes" "dolist" "the" "locally"
                    "proclaim" "declaim" "declare" "symbol-macrolet"
                    "lexical-let" "lexical-let*" "flet" "labels" "compiler-let"
!                   "destructuring-bind" "macrolet" "tagbody" "block" "go"
!                   "multiple-value-bind" "multiple-value-prog1"
                    "return" "return-from"
                    "with-accessors" "with-compilation-unit"
                    "with-condition-restarts" "with-hash-table-iterator"
***************
*** 1967,1973 ****
            '(2 font-lock-constant-face nil t))
        ;;
        ;; Erroneous structures.
!       '("(\\(abort\\|assert\\|error\\|signal\\)\\>" 1 font-lock-warning-face)
        ;;
        ;; Words inside \\[] tend to be for `substitute-command-keys'.
        '("\\\\\\\\\\[\\(\\sw+\\)]" 1 font-lock-constant-face prepend)
--- 1967,1973 ----
            '(2 font-lock-constant-face nil t))
        ;;
        ;; Erroneous structures.
!       
'("(\\(abort\\|assert\\|warn\\|check-type\\|cerror\\|error\\|signal\\)\\>" 1 
font-lock-warning-face)
        ;;
        ;; Words inside \\[] tend to be for `substitute-command-keys'.
        '("\\\\\\\\\\[\\(\\sw+\\)]" 1 font-lock-constant-face prepend)