From: Alan Mackenzie <acm@muc.de>
Date: Tue, 10 May 2016 14:36:02 +0000 (+0000)
Subject: Revert "Fix spurious fontification of "for (; a * b;)" in CC Mode."
X-Git-Tag: emacs-26.0.90~1965
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8939ae68d430ef272194ac64144ceb58ae0dbd3f;p=emacs.git

Revert "Fix spurious fontification of "for (; a * b;)" in CC Mode."

This reverts commit 89d1776b81ab552192ee41f13ce84ff86bda4556.  It is
being reverted because it slowed down CC Mode's fontification too much
(factor ~3).  It was the fix to bug #7918.
---

diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 6c348514915..e171b20f328 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -1205,20 +1205,8 @@ casts and declarations are fontified.  Used on level 2 and higher."
 			   'font-lock-keyword-face)
 		       (looking-at c-not-decl-init-keywords))
 		  (and c-macro-with-semi-re
-		       (looking-at c-macro-with-semi-re)) ; 2008-11-04
-		  (save-excursion ; A construct after a ; in a `for' statement
-				  ; can't be a declaration.
-		    (and (c-go-up-list-backward)
-			 (eq (char-after) ?\()
-			 (progn (c-backward-syntactic-ws)
-				(c-simple-skip-symbol-backward))
-			 (looking-at c-paren-stmt-key)
-			 (progn (goto-char match-pos)
-				(while (and (eq (char-before) ?\))
-					    (c-go-list-backward))
-				  (c-backward-syntactic-ws))
-				(eq (char-before) ?\;)))))
-	      ;; Don't do anything more if we're looking at something that
+		       (looking-at c-macro-with-semi-re))) ; 2008-11-04
+	      ;; Don't do anything more if we're looking at a keyword that
 	      ;; can't start a declaration.
 	      t