From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 14 Jul 1998 08:22:05 +0000 (+0000)
Subject: (lisp-font-lock-keywords-2): support `handler-*',
X-Git-Tag: emacs-20.3~322
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aaa154880b833976770f5e39fc821ab1d2966db0;p=emacs.git

(lisp-font-lock-keywords-2): support `handler-*',
`restart-*', `*-bind', `abort', `the', `break', `compiler-let'
`symbol-macrolet' etc.
(lisp-font-lock-keywords-1): Support `define-*-macro',
`define-condition', `define-setf-expander' etc.
---

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 0d8f881c210..2dbb5e0c72b 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1908,8 +1908,9 @@ This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item."
 		   ;; Function declarations.
 		   "\\(advice\\|alias\\|generic\\|macro\\*?\\|method\\|"
 		   "setf\\|subst\\*?\\|un\\*?\\|"
-		   "ine-\\(derived-mode\\|function\\|"
-		   "skeleton\\|widget\\)\\)\\|"
+		   "ine-\\(derived-mode\\|function\\|condition\\|"
+		   "skeleton\\|widget\\|setf-expander\\|method-combination\\|"
+		   "\\(symbol\\|compiler\\|modify\\)-macro\\)\\)\\|"
 		   ;; Variable declarations.
 		   "\\(const\\|custom\\|face\\|var\\)\\|"
 		   ;; Structure declarations.
@@ -1919,8 +1920,9 @@ This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item."
 		   "[ \t'\(]*"
 		   "\\(\\sw+\\)?")
 	   '(1 font-lock-keyword-face)
-	   '(7 (cond ((match-beginning 3) font-lock-function-name-face)
-		     ((match-beginning 5) font-lock-variable-name-face)
+	   '(8 (cond ((match-beginning 3) font-lock-function-name-face)
+		     ((match-beginning 4) font-lock-function-name-face)
+		     ((match-beginning 6) font-lock-variable-name-face)
 		     (t font-lock-type-face))
 	       nil t))
      ;;
@@ -1956,10 +1958,13 @@ This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item."
       (cons (concat
 	     "(" (regexp-opt
 		  '("when" "unless" "case" "ecase" "typecase" "etypecase"
-                    "ccase" "ctypecase" "handler-case" "assert" "error"
-		    "loop" "do" "do*" "dotimes" "dolist"
-		    "proclaim" "declaim" "declare"
-		    "lexical-let" "lexical-let*" "flet" "labels"
+		    "ccase" "ctypecase" "handler-case" "handler-bind"
+		    "restart-bind" "restart-case"
+		    "assert" "abort" "error" "cerror" "break" "ignore-errors"
+		    "loop" "do" "do*" "dotimes" "dolist" "the"
+		    "proclaim" "declaim" "declare" "symbol-macrolet"
+		    "lexical-let" "lexical-let*" "flet" "labels" "compiler-let"
+		    "destructuring-bind" "macrolet" "tagbody" "block"
 		    "return" "return-from") t)
 	     "\\>")
 	    1)