[Emacs-diffs] emacs-24 r117667: Fix error messages from jit-stealth-lock when load-average returns nil.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117667
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-11-04 18:30:48 +0200
message:
  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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/jit-lock.el               jitlock.el-20091113204419-o5vbwnq5f7feedwu-1321

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-11-04 09:02:56 +0000
+++ b/lisp/ChangeLog    2014-11-04 16:30:48 +0000
@@ -1,3 +1,8 @@
+2014-11-04  Eli Zaretskii  <address@hidden>
+
+       * jit-lock.el (jit-lock-stealth-fontify): Be tolerant to nil being
+       returned by load-average.
+
 2014-11-04  Michael Albinus  <address@hidden>
 
         * net/tramp-sh.el (tramp-do-copy-or-rename-file-via-buffer): Don't use

=== modified file 'lisp/jit-lock.el'
--- a/lisp/jit-lock.el  2014-02-13 08:26:01 +0000
+++ b/lisp/jit-lock.el  2014-11-04 16:30:48 +0000
@@ -503,7 +503,10 @@
          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)