2 files changed, 8 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8fa631f5b75..f62d0ee3b66 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2014-08-09  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-fonts.el (c-font-lock-declarators): Remove check
+        for top-level that can cause unacceptable slow-down in scrolling.
+        See email Subject: Huge {...} blocks in C/C++ again, from Dmitry
+        Antipov from 2013-10-14 in emacs-devel.
+
 2014-08-08  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
         * ibuffer.el (ibuffer-mode-map): Use toggle button for
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 8ee8054876d..a107ef01250 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -1128,11 +1128,7 @@ casts and declarations are fontified.  Used on level 2 and higher."
 
       (setq next-pos (match-beginning 0)
             id-face (if (and (eq (char-after next-pos) ?\()
-                             (not brackets-after-id)
-                             (let (c-last-identifier-range)
-                               (save-excursion
-                                 (goto-char next-pos)
-                                 (c-at-toplevel-p))))
+                             (not brackets-after-id))
                         'font-lock-function-name-face
                       'font-lock-variable-name-face)
             got-init (and (match-beginning 1)