[Emacs-diffs] trunk r114729: Allow comma separated lists after Java "implements".

[Alan Mackenzie]

------------------------------------------------------------
revno: 114729
revision-id: address@hidden
parent: address@hidden
committer: Alan Mackenzie <address@hidden>
branch nick: trunk
timestamp: Sun 2013-10-20 14:27:22 +0000
message:
  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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/cc-engine.el    
ccengine.el-20091113204419-o5vbwnq5f7feedwu-1227
  lisp/progmodes/cc-fonts.el     ccfonts.el-20091113204419-o5vbwnq5f7feedwu-2930

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-10-20 11:28:58 +0000
+++ b/lisp/ChangeLog    2013-10-20 14:27:22 +0000
@@ -1,3 +1,12 @@
+2013-10-20  Alan Mackenzie  <address@hidden>
+
+       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  <address@hidden>
 
        * startup.el (default-frame-background-mode): Remove unused

=== modified file 'lisp/progmodes/cc-engine.el'
--- a/lisp/progmodes/cc-engine.el       2013-10-19 15:11:07 +0000
+++ b/lisp/progmodes/cc-engine.el       2013-10-20 14:27:22 +0000
@@ -8492,10 +8492,12 @@
         (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)

=== modified file 'lisp/progmodes/cc-fonts.el'
--- a/lisp/progmodes/cc-fonts.el        2013-10-13 19:54:46 +0000
+++ b/lisp/progmodes/cc-fonts.el        2013-10-20 14:27:22 +0000
@@ -1884,7 +1884,7 @@
                "\\)\\>"
                ;; 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