diff options
| author | Alan Mackenzie <acm@muc.de> | 2016-08-17 18:06:24 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2016-08-17 18:06:24 +0000 |
| commit | 5ee08b3d6d59520abd138b559fdcb8e79386f7a8 (patch) | |
| tree | 7bf9db4ed8bc69fb336d1c56376bbeacbcc57800 /lisp/progmodes/cc-engine.el | |
| parent | 848591904dbf0b5f19cdeaf73944bf6730fac7c1 (diff) | |
| download | emacs-5ee08b3d6d59520abd138b559fdcb8e79386f7a8.tar.gz emacs-5ee08b3d6d59520abd138b559fdcb8e79386f7a8.tar.bz2 emacs-5ee08b3d6d59520abd138b559fdcb8e79386f7a8.zip | |
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 "::").
Diffstat (limited to 'lisp/progmodes/cc-engine.el')
| -rw-r--r-- | lisp/progmodes/cc-engine.el | 7 |
1 files changed, 7 insertions, 0 deletions
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 |