(ediff-files, ediff-files3, ediff-merge-files)

[gnu-emacs] / lisp / jit-lock.el

diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index 84e0dc0cab3164561f738f652e0d198632c3dc71..0e131b665efc85bc5c681c3f654d17c69354cd3b 100644 (file)
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -301,7 +301,7 @@ Only applies to the current buffer."
 This function is added to `fontification-functions' when `jit-lock-mode'
 is active."
   (when (and jit-lock-mode (not memory-full))
-    (if (null jit-lock-defer-time)
+    (if (null jit-lock-defer-timer)
        ;; No deferral.
        (jit-lock-fontify-now start (+ start jit-lock-chunk-size))
       ;; Record the buffer for later fontification.
@@ -510,7 +510,7 @@ This functions is called after Emacs has been idle for
                   (setq pos (next-single-property-change pos 'fontified)))))))))
     (setq jit-lock-defer-buffers nil)
     ;; Force fontification of the visible parts.
-    (let ((jit-lock-defer-time nil))
+    (let ((jit-lock-defer-timer nil))
       ;; (message "Jit-Defer Now")
       (sit-for 0)
       ;; (message "Jit-Defer Done")