[Emacs-diffs] master 5a45a6b: Amend c-colon-type-list-re also to handle compound identifiers

[Alan Mackenzie]

branch: master
commit 5a45a6bfe06afbe0e76544acec02b694611c777f
Author: Alan Mackenzie <address@hidden>
Commit: Alan Mackenzie <address@hidden>

    Amend c-colon-type-list-re also to handle compound identifiers
    
    * lisp/progmodes/cc-langs.el (c-colon-type-list-re): Amend to recognize and
    skip over "::" in C++ and "." in Java.
---
 lisp/progmodes/cc-langs.el | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 8671e18..4a7c79a 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -2461,7 +2461,11 @@ regexp if `c-colon-type-list-kwds' isn't nil."
        ;; before the ":" that starts the inherit list after "class"
        ;; or "struct" in C++.  (Also used as default for other
        ;; languages.)
-       "[^][{}();,/#=:]*:"))
+       (if (c-lang-const c-opt-identifier-concat-key)
+           (concat "\\([^][{}();,/#=:]\\|"
+                   (c-lang-const c-opt-identifier-concat-key)
+                   "\\)*:")
+         "[^][{}();,/#=:]*:")))
 (c-lang-defvar c-colon-type-list-re (c-lang-const c-colon-type-list-re))
 
 (c-lang-defconst c-paren-nontype-kwds