From 081fb694c3f88e77d4a0e09fba8ce457037b9132 Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Thu, 20 Dec 2018 12:21:16 +0000 Subject: [PATCH] Check result from c-backward-token-2 to avoid infinite loop This fixes bug #33784. * lisp/progmodes/cc-fonts.el (c-get-fontification-context): While moving back over enclosing parentheses, check that c-backward-token-2 actually moves. --- lisp/progmodes/cc-fonts.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index 39d167f0190..2e47bdab567 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -1284,8 +1284,8 @@ casts and declarations are fontified. Used on level 2 and higher." (save-excursion (goto-char match-pos) (while - (progn (c-backward-token-2) - (eq (char-after) ?\())) + (and (zerop (c-backward-token-2)) + (eq (char-after) ?\())) (looking-at c-arithmetic-op-regexp))) (cons nil nil)) ;; In a C++ member initialization list. -- 2.39.5