diff options
| author | Alan Mackenzie <acm@muc.de> | 2023-04-05 13:02:12 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2023-04-05 13:02:12 +0000 |
| commit | a42f4a775bab61581d6b8dbd4fe2eeab55a6ea31 (patch) | |
| tree | 850fa208c92cbfb285f070fa9dbefb9450e246ac /lisp/progmodes/cc-fonts.el | |
| parent | 8678708ad10b17a4609c950a02cf39ab9ff86317 (diff) | |
| download | emacs-a42f4a775bab61581d6b8dbd4fe2eeab55a6ea31.tar.gz | |
CC Mode: Fix fontification problems shown by test file templates-20.cc
Also fix one problem evident in test file decls-10.cc.
* lisp/progmodes/cc-engine.el (c-brace-stack-at): Bind
c-record-type-identifiers to nil to prevent called functions recording
identifiers spuriously.
(c-forward-<>-arglist-recur): Revert the ill-advised optimization from autumn
2022 which attempted to avoid re-marking c-type text properties inside angle
bracket arglists.
(c-forward-decl-or-cast-1): Accept the semicolon at the end of "t8 * id;" as
sufficient evidence to fontify as a declaration (not a multiplication).
* lisp/progmodes/cc-fonts.el (c-font-lock-c++-using): No longer fontify the
last component of foo::bar with c-reference-face-name.
Diffstat (limited to 'lisp/progmodes/cc-fonts.el')
| -rw-r--r-- | lisp/progmodes/cc-fonts.el | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index f726fef467e..17b3c7be199 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -2678,9 +2678,7 @@ need for `c-font-lock-extra-types'.") 'same) (looking-at c-colon-type-list-re))) ;; Inherited protected member: leave unfontified - ) - (t (goto-char pos) - (c-font-lock-declarators limit nil c-label-face-name nil))) + )) (eq (char-after) ?,))) (forward-char))) ; over the comma. nil)) |