Merge from emacs-24; up to 117669

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

diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index d346f050415ef0af2faa37fac81daa9122099d16..34f14a5af63cafe9283441fe4a9b0a20096ad3ac 100644 (file)
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -499,7 +499,10 @@ non-nil in a repeated invocation of this function."
          message-log-max
          start)
       (if (and jit-lock-stealth-load
-              (> (car (load-average)) jit-lock-stealth-load))
+              ;; load-average can return nil.  The w32 emulation does
+              ;; that during the first few dozens of seconds after
+              ;; startup.
+              (> (or (car (load-average)) 0) jit-lock-stealth-load))
          ;; Wait a little if load is too high.
          (setq delay jit-lock-stealth-time)
        (if (buffer-live-p buffer)