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

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.

1 files changed, 7 insertions, 4 deletions

diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 0bf89b9a36a..48a6619bd1e 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -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