Commit a1740a15 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fix error messages from jit-stealth-lock when load-average returns nil.

 lisp/jit-lock.el (jit-lock-stealth-fontify): Be tolerant to nil being
 returned by load-average.
parent b6ad7054
2014-11-04 Eli Zaretskii <>
* jit-lock.el (jit-lock-stealth-fontify): Be tolerant to nil being
returned by load-average.
2014-11-04 Michael Albinus <>
* net/tramp-sh.el (tramp-do-copy-or-rename-file-via-buffer): Don't use
......@@ -503,7 +503,10 @@ non-nil in a repeated invocation of this function."
(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)
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