From: Alan Mackenzie <acm@muc.de>
Date: Thu, 20 Dec 2018 12:21:16 +0000 (+0000)
Subject: Check result from c-backward-token-2 to avoid infinite loop
X-Git-Tag: emacs-26.1.91~31
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=081fb694c3f88e77d4a0e09fba8ce457037b9132;p=emacs.git

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.
---

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.