diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-11-04 21:08:57 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-11-04 21:08:57 -0800 |
| commit | b6e66a5cc78e353ff9ae6cdd0807eefcf55b4934 (patch) | |
| tree | c7562d5cde06977fc2eb14a7c0b6972738696386 /lisp/jit-lock.el | |
| parent | ddce73d32fa3e62e022842e3bbdc0aa83bb358cc (diff) | |
| parent | 58064b4da2835acb24d0f68021c84102e0fb1c0f (diff) | |
| download | emacs-b6e66a5cc78e353ff9ae6cdd0807eefcf55b4934.tar.gz | |
Merge from emacs-24; up to 117669
Diffstat (limited to 'lisp/jit-lock.el')
| -rw-r--r-- | lisp/jit-lock.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el index d346f050415..34f14a5af63 100644 --- 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) |