aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann1999-12-16 12:11:18 +0000
committerGerd Moellmann1999-12-16 12:11:18 +0000
commit340fe50f3b5fe8b00fb5c4a6fd51b7fbd5bb140b (patch)
tree7081a5e103d5d9b4b7a960cdff1a389b38184bdd
parenta5e0e1a8abc622c8d184c1b3a6e068b93485c0cc (diff)
downloademacs-340fe50f3b5fe8b00fb5c4a6fd51b7fbd5bb140b.tar.gz
emacs-340fe50f3b5fe8b00fb5c4a6fd51b7fbd5bb140b.zip
(java-keywords): Add Javadoc tags as of JDK 1.2.1.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/font-lock.el5
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f2a0a6dede8..3eae79d4a91 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
11999-12-16 Gerd Moellmann <gerd@gnu.org>
2
3 * font-lock.el (java-keywords): Add Javadoc tags as of JDK 1.2.1.
4
11999-12-16 Eli Zaretskii <eliz@is.elta.co.il> 51999-12-16 Eli Zaretskii <eliz@is.elta.co.il>
2 6
3 * ls-lisp.el (ls-lisp-insert-directory): Print an explicit message 7 * ls-lisp.el (ls-lisp-insert-directory): Print an explicit message
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 7da2c0f5652..cf612452105 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -2943,11 +2943,14 @@ See also `java-font-lock-extra-types'.")
2943 '("\\<\\(false\\|null\\|true\\)\\>" . font-lock-constant-face) 2943 '("\\<\\(false\\|null\\|true\\)\\>" . font-lock-constant-face)
2944 ;; 2944 ;;
2945 ;; Javadoc tags within comments. 2945 ;; Javadoc tags within comments.
2946 '("@\\(author\\|exception\\|return\\|see\\|version\\)\\>" 2946 '("@\\(author\\|deprecated\\|link\\|return\\|see\\|version\\)\\>"
2947 (1 font-lock-constant-face prepend)) 2947 (1 font-lock-constant-face prepend))
2948 '("@\\(param\\)\\>[ \t]*\\(\\sw+\\)?" 2948 '("@\\(param\\)\\>[ \t]*\\(\\sw+\\)?"
2949 (1 font-lock-constant-face prepend) 2949 (1 font-lock-constant-face prepend)
2950 (2 font-lock-variable-name-face prepend t)) 2950 (2 font-lock-variable-name-face prepend t))
2951 '("@\\(exception\\|throws\\)\\>[ \t]*\\(\\S-+\\)?"
2952 (1 font-lock-constant-face prepend)
2953 (2 font-lock-type-face prepend t))
2951 ))) 2954 )))
2952 2955
2953 (setq java-font-lock-keywords-3 2956 (setq java-font-lock-keywords-3