# HG changeset patch
# User Didier Verna <didier@xemacs.org>
# Date 1270643921 -7200
# Node ID 77907bd57d25f39769b0d7d3726d94fc61b3372f
# Parent  41ac827cb71b338997826f19f550937e31696a71
Add missing CL style fontification.

lisp/ChangeLog addition:

2010-04-07  Didier Verna  <didier@xemacs.org>

	* font-lock.el (lisp-font-lock-keywords-2): Add missing CL style
	lambda list constructs (&key etc.).
	* lisp-mode.el (lisp-function-and-type-regexp): Recognize defun*
	as well as defun.

diff -r 41ac827cb71b -r 77907bd57d25 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Apr 06 23:29:35 2010 -0500
+++ b/lisp/ChangeLog	Wed Apr 07 14:38:41 2010 +0200
@@ -1,3 +1,10 @@
+2010-04-07  Didier Verna  <didier@xemacs.org>
+
+	* font-lock.el (lisp-font-lock-keywords-2): Add missing CL style
+	lambda list constructs (&key etc.).
+	* lisp-mode.el (lisp-function-and-type-regexp): Recognize defun*
+	as well as defun.
+
 2010-04-02  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* descr-text.el (describe-char-unicode-data):
diff -r 41ac827cb71b -r 77907bd57d25 lisp/font-lock.el
--- a/lisp/font-lock.el	Tue Apr 06 23:29:35 2010 -0500
+++ b/lisp/font-lock.el	Wed Apr 07 14:38:41 2010 +0200
@@ -2259,7 +2259,9 @@
     '("\\<:\\sw+\\>" 0 font-lock-reference-face prepend)
     ;;
     ;; ELisp and CLisp `&' keywords as types.
-    '("\\<\\&\\(optional\\|rest\\|whole\\)\\>" . font-lock-type-face)
+    '("\\<\\&\\(\
+optional\\|rest\\|body\\|whole\\|key\\|allow-other-keys\\|aux\\|environment\
+\\)\\>" . font-lock-type-face)
     ))
   "Gaudy level highlighting for Lisp modes.")
 
diff -r 41ac827cb71b -r 77907bd57d25 lisp/lisp-mode.el
--- a/lisp/lisp-mode.el	Tue Apr 06 23:29:35 2010 -0500
+++ b/lisp/lisp-mode.el	Wed Apr 07 14:38:41 2010 +0200
@@ -699,7 +699,7 @@
 (defvar lisp-function-and-type-regexp
   (concat "def\\("
 	  ;; def but not define-.
-	  "\\(un\\|advice\\|alias\\|macro\\*?\\|setf\\|subst\\*?\\|"
+	  "\\(un\\*?\\|advice\\|alias\\|macro\\*?\\|setf\\|subst\\*?\\|"
 	  "-edebug-spec\\|"
 	  ;; CLOS
 	  "method\\|generic\\|"