From 5ee08b3d6d59520abd138b559fdcb8e79386f7a8 Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Wed, 17 Aug 2016 18:06:24 +0000 Subject: [PATCH] Fontify constructs following "::" in C++ argument lists correctly. This fixes bug #24246. * lisp/progmodes/cc-engine.el (c-find-decl-prefix-search): In the "pseudo match" loop, test a found string for a match with c-opt-identifier-concat-key (e.g. with "::"). --- lisp/progmodes/cc-engine.el | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 625e87f109d..1310ef77f7e 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -5168,6 +5168,13 @@ comment at the start of cc-engine.el for more info." (and (< (point) cfd-limit) (c-got-face-at (point) c-literal-faces)))) t) ; Continue the loop over pseudo matches. + ((and c-opt-identifier-concat-key + (match-string 1) + (save-excursion + (goto-char (match-beginning 1)) + (looking-at c-opt-identifier-concat-key))) + ;; Found, e.g., "::" in C++ + t) ((and (match-string 1) (string= (match-string 1) ":") (save-excursion -- 2.39.2