(java-keywords): Added missing java 1.2.2 Javadoc tags.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0974724756085d153b7ee5efbb724e54d256894b..bfb013423116c30baac2da0928278c1372e98d02 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2000-02-28  Eli Barzilay  <eli@cs.cornell.edu>
+
+       * calculator.el (calculator-use-menu): New option.
+       (calculator-initial-bindings): Changed some bindings to work as
+       macros.
+       (calculator-forced-input): Removed.
+       (calculator-restart-other-mode): New variable.
+       (calculator-mode-map): Set up menu.
+       
+2000-02-28  Jari Aalto  <jari.aalto@poboxes.com>
+
+       * font-lock.el (java-keywords): Added missing java 1.2.2 Javadoc
+       tags.
+       
 2000-02-28  Michael Kifer  <kifer@cs.sunysb.edu>
        
        * viper-cmd.el (viper-envelop-ESC-key): added the option to
@@ -12,7 +26,6 @@
        * ediff-wind.el: minor comment changes.
        * ediff.el: copyright notice date fix.
        
-       
 2000-02-27  Jason Rumney  <jasonr@gnu.org>
 
        * faces.el (face-font-family-alternatives): Add arial to helv.

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index f264805f3d722163d8e084eccb96451119e7e1d8..7ce189dc967fb7cf28ee0fe5302a13548b25d974 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -3095,8 +3095,13 @@ See also `java-font-lock-extra-types'.")
     '("\\<\\(false\\|null\\|true\\)\\>" . font-lock-constant-face)
     ;;
     ;; Javadoc tags within comments.
-    '("@\\(author\\|deprecated\\|link\\|return\\|see\\|version\\)\\>"
-      (1 font-lock-constant-face prepend))
+    (list
+     (concat "@\\("
+            "author\\|deprecated\\|exception"
+            "\\|link\\|return\\|see\\|serial\\|serialData\\|serialField"
+            "\\|since\\|throws"
+            "\\|version"
+            "\\)\\>"))
     '("@\\(param\\)\\>[ \t]*\\(\\sw+\\)?"
       (1 font-lock-constant-face prepend)
       (2 font-lock-variable-name-face prepend t))