diff options
| author | Alan Mackenzie | 2016-08-17 18:06:24 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2016-08-17 18:06:24 +0000 |
| commit | 5ee08b3d6d59520abd138b559fdcb8e79386f7a8 (patch) | |
| tree | 7bf9db4ed8bc69fb336d1c56376bbeacbcc57800 | |
| parent | 848591904dbf0b5f19cdeaf73944bf6730fac7c1 (diff) | |
| download | emacs-5ee08b3d6d59520abd138b559fdcb8e79386f7a8.tar.gz 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 "::").
| -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." | |||
| 5168 | (and (< (point) cfd-limit) | 5168 | (and (< (point) cfd-limit) |
| 5169 | (c-got-face-at (point) c-literal-faces)))) | 5169 | (c-got-face-at (point) c-literal-faces)))) |
| 5170 | t) ; Continue the loop over pseudo matches. | 5170 | t) ; Continue the loop over pseudo matches. |
| 5171 | ((and c-opt-identifier-concat-key | ||
| 5172 | (match-string 1) | ||
| 5173 | (save-excursion | ||
| 5174 | (goto-char (match-beginning 1)) | ||
| 5175 | (looking-at c-opt-identifier-concat-key))) | ||
| 5176 | ;; Found, e.g., "::" in C++ | ||
| 5177 | t) | ||
| 5171 | ((and (match-string 1) | 5178 | ((and (match-string 1) |
| 5172 | (string= (match-string 1) ":") | 5179 | (string= (match-string 1) ":") |
| 5173 | (save-excursion | 5180 | (save-excursion |