procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
lisp/jit-lock.el (jit-lock-stealth-fontify): Be tolerant to nil being
 returned by load-average.
This commit is contained in:
Eli Zaretskii 2014-11-04 18:30:48 +02:00
parent b6ad705482
commit a1740a150d
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2014-11-04 Eli Zaretskii <eliz@gnu.org>
* jit-lock.el (jit-lock-stealth-fontify): Be tolerant to nil being
returned by load-average.
2014-11-04 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-sh.el (tramp-do-copy-or-rename-file-via-buffer): Don't use

5
lisp/jit-lock.el
View file

@ -503,7 +503,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)