aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2007-08-28 02:52:58 +0000
committerGlenn Morris2007-08-28 02:52:58 +0000
commitbab9fcb48d43a81d3bee5c13f370a7cbd6abe720 (patch)
treee4f1f70fae6558d6c622cffd53d871021f5ac644
parentfd45e2f4cd026a4f787e9c7eda7e5daff1e41034 (diff)
downloademacs-bab9fcb48d43a81d3bee5c13f370a7cbd6abe720.tar.gz
emacs-bab9fcb48d43a81d3bee5c13f370a7cbd6abe720.zip
(c-constant-kwds): Add java: null, true, false.
-rw-r--r--admin/ChangeLog4
-rw-r--r--lisp/progmodes/cc-langs.el1
2 files changed, 5 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 3cb98270c8b..10cec99a09b 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
12007-08-28 Glenn Morris <rgm@gnu.org>
2
3 * admin.el: Provide self.
4
12007-08-10 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 52007-08-10 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2 6
3 * FOR-RELEASE (http): Add Gtk+ tool bar and GUD focus problem. 7 * FOR-RELEASE (http): Add Gtk+ tool bar and GUD focus problem.
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 ','."
2075 "false" "true") ; Defined in C99. 2075 "false" "true") ; Defined in C99.
2076 objc '("nil" "Nil") 2076 objc '("nil" "Nil")
2077 idl '("TRUE" "FALSE") 2077 idl '("TRUE" "FALSE")
2078 java '("true" "false" "null") ; technically "literals", not keywords
2078 pike '("UNDEFINED")) ;; Not a keyword, but practically works as one. 2079 pike '("UNDEFINED")) ;; Not a keyword, but practically works as one.
2079 2080
2080(c-lang-defconst c-primary-expr-kwds 2081(c-lang-defconst c-primary-expr-kwds