X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Ffont-lock.el;h=e2ed681eeb344509111ec668e886309702850cdd;hb=8cb6271e99e31df282456512ac223377e9a08527;hp=5ee4072491582379b12f8175be4dbd3b39f9f685;hpb=ac7d0619aad74b1d57c4748ebb3ab29d9c32e3d8;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 5ee4072..e2ed681 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1982,7 +1982,7 @@ Each keyword has the form (MATCHER HIGHLIGHT ...).  See `font-lock-keywords'."
 		  "\\)\\)\\>"
 		  ;; Any whitespace and declared object.
 		  "[ \t'\(]*"
-		  "\\([^ \t\n\)]+\\)?")
+		  "\\([^ \t\n\(\)]+\\)?")
 	  '(1 font-lock-keyword-face)
 	  '(8 (cond ((match-beginning 3) 'font-lock-variable-name-face)
 		    ((match-beginning 6) 'font-lock-type-face)
@@ -2503,9 +2503,10 @@ The name is assumed to begin with a capital letter.")
 	 (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\\|"
@@ -2691,10 +2692,10 @@ The name is assumed to begin with a capital letter.")
 	  '("\\(@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)
     
 	  )))
@@ -2710,32 +2711,34 @@ The name is assumed to begin with a capital letter.")
 ;; the cursor to fontify more identifiers.
 (defun font-lock-match-java-declarations (limit)
   "Match and skip over variable definitions."
-  (if (looking-at "\\s *\\(\\[\\s *\\]\\s *\\)*")
-      (goto-char (match-end 0)))
-  (and
-   (looking-at java-font-lock-identifier-regexp)
-   (save-match-data
-     (not (string-match java-font-lock-type-regexp
-			(buffer-substring (match-beginning 1)
-					  (match-end 1)))))
-   (save-match-data
-     (save-excursion
-       (goto-char (match-beginning 1))
-       (not (looking-at
-	     (concat java-font-lock-class-name-regexp
-		     "\\s *\\(\\[\\s *\\]\\s *\\)*\\<")))))
-   (save-match-data
-     (condition-case nil
-	 (save-restriction
-	   (narrow-to-region (point-min) limit)
-	   (goto-char (match-end 0))
-	   ;; Note: Both `scan-sexps' and the second goto-char can
-	   ;; generate an error which is caught by the
-	   ;; `condition-case' expression.
-	   (while (not (looking-at "\\s *\\(\\(,\\)\\|;\\|$\\)"))
-	     (goto-char (or (scan-sexps (point) 1) (point-max))))
-	   (goto-char (match-end 2)))   ; non-nil
-       (error t)))))
+  (save-restriction
+    (narrow-to-region (point-min) limit)
+
+    (if (looking-at "\\s *\\(\\[\\s *\\]\\s *\\)*")
+	(goto-char (match-end 0)))
+    (and
+     (looking-at java-font-lock-identifier-regexp)
+     (save-match-data
+       (not (string-match java-font-lock-type-regexp
+			  (buffer-substring (match-beginning 1)
+					    (match-end 1)))))
+     (save-match-data
+       (save-excursion
+	 (goto-char (match-beginning 1))
+	 (not (looking-at
+	       (concat java-font-lock-class-name-regexp
+		       "\\s *\\(\\[\\s *\\]\\s *\\)*\\<")))))
+     (save-match-data
+       (condition-case nil
+	   (progn
+	     (goto-char (match-end 0))
+	     ;; Note: Both `scan-sexps' and the second goto-char can
+	     ;; generate an error which is caught by the
+	     ;; `condition-case' expression.
+	     (while (not (looking-at "\\s *\\(\\(,\\)\\|;\\|$\\)"))
+	       (goto-char (or (scan-sexps (point) 1) (point-max))))
+	     (goto-char (match-end 2)))   ; non-nil
+	 (error t))))))
 
 
 (defvar tex-font-lock-keywords