Commit 3f6b93cd authored by Alan Mackenzie's avatar Alan Mackenzie
Browse files

Speed up fontification where there's large brace blocks.

progmodes/cc-fonts.el (c-font-lock-enclosing-decls): Add a limit to a
call of c-beginning-of-decl-1.
parent 173076b4
2012-12-23 Alan Mackenzie <acm@muc.de>
Speed up fontification where there's large brace blocks.
* progmodes/cc-fonts.el (c-font-lock-enclosing-decls): Add a limit
to a call of c-beginning-of-decl-1.
2012-12-21 Chong Yidong <cyd@gnu.org>
 
* sort.el (sort-subr): Doc fix (Bug#13056).
......
......@@ -1591,6 +1591,7 @@ casts and declarations are fontified. Used on level 2 and higher."
;; prevent a repeat invocation. See elisp/lispref page "Search-based
;; Fontification".
(let* ((paren-state (c-parse-state))
(decl-search-lim (c-determine-limit 1000))
decl-context in-typedef ps-elt)
;; Are we in any nested struct/union/class/etc. braces?
(while paren-state
......@@ -1599,7 +1600,7 @@ casts and declarations are fontified. Used on level 2 and higher."
(when (and (atom ps-elt)
(eq (char-after ps-elt) ?\{))
(goto-char ps-elt)
(setq decl-context (c-beginning-of-decl-1)
(setq decl-context (c-beginning-of-decl-1 decl-search-lim)
in-typedef (looking-at c-typedef-key))
(if in-typedef (c-forward-token-2))
(when (and c-opt-block-decls-with-vars-key
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment