# HG changeset patch
# User vins
# Date 1139018166 0
# Node ID bdc2d7488c19fff7f0e007716b17a3e3dcd268a0
# Parent  bc7f93e5beeda17b1bc739e844eb4f1576958f86
[xemacs-hg @ 2006-02-04 01:56:05 by vins]
Martin's Java keyword patch.

diff -r bc7f93e5beed -r bdc2d7488c19 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Feb 03 22:51:17 2006 +0000
+++ b/lisp/ChangeLog	Sat Feb 04 01:56:06 2006 +0000
@@ -1,3 +1,8 @@
+2004-01-19  Martin Buchholz  <martin@xemacs.org>
+
+	* font-lock.el: Add support for not-so recent changes in Java to
+	java-mode.
+
 2006-01-08  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* cmdloop.el (read-quoted-char):
diff -r bc7f93e5beed -r bdc2d7488c19 lisp/font-lock.el
--- a/lisp/font-lock.el	Fri Feb 03 22:51:17 2006 +0000
+++ b/lisp/font-lock.el	Sat Feb 04 01:56:06 2006 +0000
@@ -2587,9 +2587,10 @@
 	 (list        
 	  (concat
 	   "\\<\\("
+	   "assert\\|"
 	   "break\\|byvalue\\|"
 	   "case\\|cast\\|catch\\|class\\|continue\\|"
-	   "do\\|else\\|extends\\|"
+	   "do\\|else\\|enum\\|extends\\|"
 	   "finally\\|for\\|future\\|"
 	   "generic\\|goto\\|"
 	   "if\\|implements\\|import\\|"
@@ -2775,10 +2776,10 @@
 	  '("\\(@beaninfo\\)"
 	    0 font-lock-keyword-face t)
 	  ;; Doc tag - Links
-	  '("{ *@link\\s +\\([^}]+\\)}"
+	  '("{ *@link\\(?:plain\\)?\\s +\\([^}]+\\)}"
 	    0 font-lock-keyword-face t)
 	  ;; Doc tag - Links
-	  '("{ *@link\\s +\\(\\(\\S +\\)\\|\\(\\S +\\s +\\S +\\)\\) *}"
+	  '("{ *@link\\(?:plain\\)?\\s +\\(\\(\\S +\\)\\|\\(\\S +\\s +\\S +\\)\\) *}"
 	    1 font-lock-function-name-face t)
     
 	  )))