2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fbfa25d3a5d..b8346887ab1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-28  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/cc-langs.el (c-constant-kwds): Add java: true, false,
+        null.
+
 2007-08-27  Alexandre Julliard  <julliard@winehq.org>
 
         * vc-git.el (vc-git-state): Call git-add --refresh to update the
@@ -5,7 +10,7 @@
         (vc-git-workfile-unchanged-p): Delegate implementation to
         vc-git-state.
         (vc-git-create-repo): Fixed invalid command.
-        
+
 2007-08-27  Richard Stallman  <rms@gnu.org>
 
         * textmodes/flyspell.el (flyspell-mode):
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 5f9dbad3be2..d0ff9c523ad 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -2075,6 +2075,7 @@ nevertheless contains a list separated with ';' and not ','."
             "false" "true")             ; Defined in C99.
   objc    '("nil" "Nil")
   idl     '("TRUE" "FALSE")
+  java    '("true" "false" "null") ; technically "literals", not keywords
   pike    '("UNDEFINED")) ;; Not a keyword, but practically works as one.
 
 (c-lang-defconst c-primary-expr-kwds