diff options
| author | Glenn Morris | 2007-08-28 02:51:09 +0000 |
|---|---|---|
| committer | Glenn Morris | 2007-08-28 02:51:09 +0000 |
| commit | fbd4de656d455bce5d8c12422d2c33af8a9c190f (patch) | |
| tree | 7e8ab4201d0179e2a2b6f19d0395e12f02fca3ab /lisp | |
| parent | 00d670807ec2370ad89b816d05d8a7c40f23d28b (diff) | |
| download | emacs-fbd4de656d455bce5d8c12422d2c33af8a9c190f.tar.gz emacs-fbd4de656d455bce5d8c12422d2c33af8a9c190f.zip | |
(c-constant-kwds): Add java: null, true, false.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/progmodes/cc-langs.el | 1 |
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 @@ | |||
| 1 | 2007-08-28 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * progmodes/cc-langs.el (c-constant-kwds): Add java: true, false, | ||
| 4 | null. | ||
| 5 | |||
| 1 | 2007-08-27 Alexandre Julliard <julliard@winehq.org> | 6 | 2007-08-27 Alexandre Julliard <julliard@winehq.org> |
| 2 | 7 | ||
| 3 | * vc-git.el (vc-git-state): Call git-add --refresh to update the | 8 | * vc-git.el (vc-git-state): Call git-add --refresh to update the |
| @@ -5,7 +10,7 @@ | |||
| 5 | (vc-git-workfile-unchanged-p): Delegate implementation to | 10 | (vc-git-workfile-unchanged-p): Delegate implementation to |
| 6 | vc-git-state. | 11 | vc-git-state. |
| 7 | (vc-git-create-repo): Fixed invalid command. | 12 | (vc-git-create-repo): Fixed invalid command. |
| 8 | 13 | ||
| 9 | 2007-08-27 Richard Stallman <rms@gnu.org> | 14 | 2007-08-27 Richard Stallman <rms@gnu.org> |
| 10 | 15 | ||
| 11 | * textmodes/flyspell.el (flyspell-mode): | 16 | * 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 ','." | |||
| 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 |