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.

diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 8671e18e2d79400950155e88092cc277319f5cb4..4a7c79a6dfa317228410f9e8e9a27394d4d1342e 100644 (file)
--- 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