Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25

2 files changed, 14 insertions, 0 deletions

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index b08c555e34f..63f01829845 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -6739,6 +6739,9 @@ comment at the start of cc-engine.el for more info."
                       (c-backward-syntactic-ws))
                     (c-back-over-list-of-member-inits)
                     (and (eq (char-before) ?:)
+                         (save-excursion
+                           (c-backward-token-2)
+                           (not (looking-at c-:$-multichar-token-regexp)))
                          (c-just-after-func-arglist-p))))
 
             (while (and (not (and level-plausible
@@ -6753,6 +6756,9 @@ comment at the start of cc-engine.el for more info."
                       (c-backward-syntactic-ws)
                       (c-back-over-list-of-member-inits)
                       (and (eq (char-before) ?:)
+                           (save-excursion
+                             (c-backward-token-2)
+                             (not (looking-at c-:$-multichar-token-regexp)))
                            (c-just-after-func-arglist-p)))))
 
             (and at-top-level level-plausible)))
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index b52da3f662d..48dd9960886 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -1219,6 +1219,14 @@ operators."
 (c-lang-defvar c-assignment-op-regexp
   (c-lang-const c-assignment-op-regexp))
 
+(c-lang-defconst c-:$-multichar-token-regexp
+  ;; Regexp matching all tokens ending in ":" which are longer than one char.
+  ;; Currently (2016-01-07) only used in C++ Mode.
+  t (c-make-keywords-re nil
+      (c-filter-ops (c-lang-const c-operators) t ".+:$")))
+(c-lang-defvar c-:$-multichar-token-regexp
+  (c-lang-const c-:$-multichar-token-regexp))
+
 (c-lang-defconst c-<>-multichar-token-regexp
   ;; Regexp matching all tokens containing "<" or ">" which are longer
   ;; than one char.