[Emacs-diffs] Changes to emacs/lisp/jit-lock.el

[Richard M . Stallman]

Index: emacs/lisp/jit-lock.el
diff -c emacs/lisp/jit-lock.el:1.35 emacs/lisp/jit-lock.el:1.36
*** emacs/lisp/jit-lock.el:1.35 Thu Mar 25 10:45:13 2004
--- emacs/lisp/jit-lock.el      Sun Mar  6 18:31:36 2005
***************
*** 415,420 ****
--- 415,421 ----
    (unless (or executing-kbd-macro
              (window-minibuffer-p (selected-window)))
      (let ((buffers (buffer-list))
+         (outer-buffer (current-buffer))
          minibuffer-auto-raise
          message-log-max)
        (with-local-quit
***************
*** 449,455 ****
                      (point (point-min)))
                  (while (and (setq start
                                    (jit-lock-stealth-chunk-start point))
!                             (sit-for nice))
  
                    ;; fontify a block.
                    (jit-lock-fontify-now start (+ start jit-lock-chunk-size))
--- 450,459 ----
                      (point (point-min)))
                  (while (and (setq start
                                    (jit-lock-stealth-chunk-start point))
!                             ;; In case sit-for runs any timers,
!                             ;; give them the expected current buffer.
!                             (with-current-buffer outer-buffer
!                               (sit-for nice)))
  
                    ;; fontify a block.
                    (jit-lock-fontify-now start (+ start jit-lock-chunk-size))
***************
*** 461,467 ****
                    ;; Wait a little if load is too high.
                    (when (and jit-lock-stealth-load
                               (> (car (load-average)) jit-lock-stealth-load))
!                     (sit-for (or jit-lock-stealth-time 30)))))))))))))
  
  
  
--- 465,474 ----
                    ;; Wait a little if load is too high.
                    (when (and jit-lock-stealth-load
                               (> (car (load-average)) jit-lock-stealth-load))
!                     ;; In case sit-for runs any timers,
!                     ;; give them the expected current buffer.
!                     (with-current-buffer outer-buffer
!                       (sit-for (or jit-lock-stealth-time 30))))))))))))))