aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorAlan Mackenzie2013-07-27 17:35:04 +0000
committerAlan Mackenzie2013-07-27 17:35:04 +0000
commitf5950f7afe5c62af0ba7dd834419a533c7215b3d (patch)
treea5a9cb005148001d1ad7456bf7247a19466761ab /lisp
parentae43b66aba93d11b6dde84209154169d54c97aae (diff)
downloademacs-f5950f7afe5c62af0ba7dd834419a533c7215b3d.tar.gz
emacs-f5950f7afe5c62af0ba7dd834419a533c7215b3d.zip
Fontify a Java generic method as a function.
* progmodes/cc-langs.el (c-recognize-<>-arglists): Set the Java value to t.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/progmodes/cc-langs.el3
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9dec56b78e8..a0680662e53 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12013-07-27 Alan Mackenzie <acm@muc.de>
2
3 Fontify a Java generic method as a function.
4 * progmodes/cc-langs.el (c-recognize-<>-arglists): Set the Java
5 value to t.
6
12013-07-27 Stephen Berman <stephen.berman@gmx.net> 72013-07-27 Stephen Berman <stephen.berman@gmx.net>
2 8
3 * calendar/todo-mode.el: Add command to rename todo files. 9 * calendar/todo-mode.el: Add command to rename todo files.
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 4e488344e16..2c0a1317b04 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -2950,7 +2950,8 @@ identifier or one of the keywords on `c-<>-type-kwds' or
2950`c-<>-arglist-kwds'. If there's an identifier before then the whole 2950`c-<>-arglist-kwds'. If there's an identifier before then the whole
2951expression is considered to be a type." 2951expression is considered to be a type."
2952 t (or (consp (c-lang-const c-<>-type-kwds)) 2952 t (or (consp (c-lang-const c-<>-type-kwds))
2953 (consp (c-lang-const c-<>-arglist-kwds)))) 2953 (consp (c-lang-const c-<>-arglist-kwds)))
2954 java t)
2954(c-lang-defvar c-recognize-<>-arglists (c-lang-const c-recognize-<>-arglists)) 2955(c-lang-defvar c-recognize-<>-arglists (c-lang-const c-recognize-<>-arglists))
2955 2956
2956(c-lang-defconst c-enums-contain-decls 2957(c-lang-defconst c-enums-contain-decls