summaryrefslogtreecommitdiff
path: root/lisp/progmodes
diff options
context:
space:
mode:
authorAlan Mackenzie <acm@muc.de>2016-05-10 14:36:02 +0000
committerAlan Mackenzie <acm@muc.de>2016-05-10 14:36:02 +0000
commit8939ae68d430ef272194ac64144ceb58ae0dbd3f (patch)
tree406aaccafecf1617ec4c66246d6196c439597399 /lisp/progmodes
parentcfa59d6a26b55d81d5df3d5a0ba618c8c5808aa0 (diff)
downloademacs-8939ae68d430ef272194ac64144ceb58ae0dbd3f.tar.gz
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.
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/cc-fonts.el16
1 files changed, 2 insertions, 14 deletions
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