procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

When looking for the end of a declarator, prevent macros fouling up the search

Browse source 
The practical implication of this bug was a random jit-lock chunk remaining
entirely unfontified.

* lisp/progmodes/cc-mode (c-fl-decl-end): If point starts inside a macro,
restrict two forward searches to the end of that macro.
This commit is contained in:
Alan Mackenzie 2017-08-22 17:04:34 +00:00
parent ee5a146e33
commit 4309d1574a
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1549,10 +1549,13 @@ Note that this is a strict tail, so won't match, e.g. \"0x....\".")
(c-backward-syntactic-ws)
(when (setq pos1 (c-on-identifier))
(goto-char pos1)
(when (and (c-forward-declarator)
(eq (c-forward-token-2) 0))
(c-backward-syntactic-ws)
(point)))))
(let ((lim (save-excursion
(and (c-beginning-of-macro)
(progn (c-end-of-macro) (point))))))
(when (and (c-forward-declarator lim)
(eq (c-forward-token-2 1 nil lim) 0))
(c-backward-syntactic-ws)
(point))))))
(defun c-change-expand-fl-region (_beg _end _old-len)
;; Expand the region (c-new-BEG c-new-END) to an after-change font-lock