Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-23 05:17:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

CC Mode: Fontify function names after long stretches of macros.

Browse source 
This fixes bug#63322.

* lisp/progmodes/cc-engine.el (c-find-decl-spots): When a
search back over syntactic whitespace hits its limit, set
cfd-match-pos and cfd-continue-pos to cfd-start-pos.

* lisp/progmodes/cc-mode.el (c-fl-decl-start): Remove an
unneeded (and harmful) condition on (point)'s position in the
main loop.
This commit is contained in:
Alan Mackenzie 2023-05-12 10:33:15 +00:00
parent 6234c3e041
commit c9cf673d50
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lisp/progmodes/cc-engine.el
View file

@ -6244,6 +6244,9 @@ comment at the start of cc-engine.el for more info."
;; prefix". The declaration prefix is the earlier of `cfd-prop-match' and
;; `cfd-re-match'. `cfd-match-pos' is set to the decl prefix.
;;
;; The variables which this macro should set for `c-find-decl-spots' are
;; `cfd-match-pos' and `cfd-continue-pos'.
;;
;; This macro might do hidden buffer changes.
'(progn
@ -6586,11 +6589,17 @@ comment at the start of cc-engine.el for more info."
;; and so we can continue the search from this point. If we
;; didn't hit `c-find-decl-syntactic-pos' then we're now in
;; the right spot to begin searching anyway.
(if (and (eq (point) c-find-decl-syntactic-pos)
c-find-decl-match-pos)
(setq cfd-match-pos c-find-decl-match-pos
cfd-continue-pos syntactic-pos)
(cond
((and (eq (point) c-find-decl-syntactic-pos)
c-find-decl-match-pos)
(setq cfd-match-pos c-find-decl-match-pos
cfd-continue-pos syntactic-pos))
((save-excursion (c-beginning-of-macro))
;; The `c-backward-syntactic-ws' ~40 lines up failed to find non
;; syntactic-ws and hit its limit, leaving us in a macro.
(setq cfd-match-pos cfd-start-pos
cfd-continue-pos cfd-start-pos))
(t
(setq c-find-decl-syntactic-pos syntactic-pos)
(when (if (bobp)
@ -6608,7 +6617,7 @@ comment at the start of cc-engine.el for more info."
(c-find-decl-prefix-search)) ; sets cfd-continue-pos
(setq c-find-decl-match-pos (and (< cfd-match-pos cfd-start-pos)
cfd-match-pos))))) ; end of `cond'
cfd-match-pos)))))) ; end of `cond'
;; Advance `cfd-continue-pos' if it's before the start position.
;; The closest continue position that might have effect at or

2
lisp/progmodes/cc-mode.el
View file

@ -2444,8 +2444,6 @@ with // and /*, not more generic line and block comments."
(setq pseudo (c-cheap-inside-bracelist-p (c-parse-state)))))))
(goto-char pseudo))
t)
(or (> (point) bod-lim)
(eq bod-lim (point-min)))
;; Move forward to the start of the next declaration.
(progn (c-forward-syntactic-ws)
;; Have we got stuck in a comment at EOB?