X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/3fd00dcb428281d57a65872fba2c5ab9745a01de..4be9beaf4e4120f67dbf525a84789525bfef2ef8:/lisp/font-lock.el

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 0d8f881c21..3a410be453 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -951,7 +951,8 @@ The value of this variable is used when Font Lock mode is turned on."
 			       (radio :tag "Mode"
 				      (const :tag "all" t)
 				      (symbol :tag "name"))
-			       (radio :tag "Decoration"
+			       (radio :tag "Support"
+				      (const :tag "none" nil)
 				      (const :tag "fast lock" fast-lock-mode)
 				      (const :tag "lazy lock" lazy-lock-mode)))
 			 ))
@@ -1908,10 +1909,11 @@ 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\\)\\|"
+		   "\\(const\\(ant\\)?\\|custom\\|face\\|var\\|parameter\\)\\|"
 		   ;; Structure declarations.
 		   "\\(class\\|group\\|package\\|struct\\|type\\)"
 		   "\\)\\)\\>"
@@ -1919,8 +1921,8 @@ 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)
+	   '(9 (cond ((match-beginning 3) font-lock-function-name-face)
+		     ((match-beginning 6) font-lock-variable-name-face)
 		     (t font-lock-type-face))
 	       nil t))
      ;;
@@ -1944,7 +1946,7 @@ This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item."
 		    "save-match-data" "save-current-buffer" "unwind-protect"
 		    "condition-case" "track-mouse"
 		    "eval-after-load" "eval-and-compile" "eval-when-compile"
-		    "eval-when"
+		    "eval-when" "lambda"
 		    "with-current-buffer" "with-electric-help"
 		    "with-output-to-string" "with-output-to-temp-buffer"
 		    "with-temp-buffer" "with-temp-file"
@@ -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" "in-package"
+		    "assert" "abort" "error" "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"
 		    "return" "return-from") t)
 	     "\\>")
 	    1)