emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 8939ae6: Revert "Fix spurious fontification of "for


From: Alan Mackenzie
Subject: [Emacs-diffs] master 8939ae6: Revert "Fix spurious fontification of "for (; a * b; )" in CC Mode."
Date: Tue, 10 May 2016 14:40:14 +0000 (UTC)

branch: master
commit 8939ae68d430ef272194ac64144ceb58ae0dbd3f
Author: Alan Mackenzie <address@hidden>
Commit: Alan Mackenzie <address@hidden>

    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.
---
 lisp/progmodes/cc-fonts.el |   16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 6c34851..e171b20 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
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]