diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/progmodes/cc-engine.el | 6 | ||||
| -rw-r--r-- | lisp/progmodes/cc-fonts.el | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a2c38104bc8..ecb5ef0e70e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2013-10-20 Alan Mackenzie <acm@muc.de> + + Allow comma separated lists after Java "implements". + + * progmodes/cc-engine.el (c-backward-over-enum-header): parse + commas. + * progmodes/cc-fonts.el (c-basic-matchers-after): Remove comma + from a "disallowed" list in enum fontification. + 2013-10-20 Johan Bockgård <bojohan@gnu.org> * startup.el (default-frame-background-mode): Remove unused diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 0d25e1355e7..8cdb3379f66 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -8492,10 +8492,12 @@ comment at the start of cc-engine.el for more info." (or (not (looking-at "\\s)")) (c-go-up-list-backward)) (cond - ((and (looking-at c-symbol-key) (c-on-identifier)) + ((and (looking-at c-symbol-key) (c-on-identifier) + (not before-identifier)) (setq before-identifier t)) ((and before-identifier - (looking-at c-postfix-decl-spec-key)) + (or (eq (char-after) ?,) + (looking-at c-postfix-decl-spec-key))) (setq before-identifier nil) t) ((looking-at c-brace-list-key) nil) diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index bcd4a5f28f8..ada83ac41b4 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -1884,7 +1884,7 @@ higher." "\\)\\>" ;; Disallow various common punctuation chars that can't come ;; before the '{' of the enum list, to avoid searching too far. - "[^\]\[{}();,/#=]*" + "[^\]\[{}();/#=]*" "{") '((c-font-lock-declarators limit t nil) (save-match-data |