]> git.eshelyaron.com Git - emacs.git/commitdiff
Fontify constructs following "::" in C++ argument lists correctly.
authorAlan Mackenzie <acm@muc.de>
Wed, 17 Aug 2016 18:06:24 +0000 (18:06 +0000)
committerAlan Mackenzie <acm@muc.de>
Wed, 17 Aug 2016 18:06:24 +0000 (18:06 +0000)
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

index 625e87f109d26aef100b16ddbda1e9f3427eb8fe..1310ef77f7ee68c5d238176efce4dfa6da9b7891 100644 (file)
@@ -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