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

[Richard M . Stallman]

Index: emacs/lisp/subr.el
diff -c emacs/lisp/subr.el:1.472 emacs/lisp/subr.el:1.473
*** emacs/lisp/subr.el:1.472    Sat Aug  6 22:13:43 2005
--- emacs/lisp/subr.el  Tue Aug  9 02:51:22 2005
***************
*** 1833,1846 ****
  (defmacro while-no-input (&rest body)
    "Execute BODY only as long as there's no pending input.
  If input arrives, that ends the execution of BODY,
! and `while-no-input' returns nil.  If BODY finishes,
! `while-no-input' returns whatever value BODY produced."
    (declare (debug t) (indent 0))
    (let ((catch-sym (make-symbol "input")))
      `(with-local-quit
         (catch ',catch-sym
         (let ((throw-on-input ',catch-sym))
!          (when (sit-for 0 0 t)
             ,@body))))))
  
  (defmacro combine-after-change-calls (&rest body)
--- 1833,1846 ----
  (defmacro while-no-input (&rest body)
    "Execute BODY only as long as there's no pending input.
  If input arrives, that ends the execution of BODY,
! and `while-no-input' returns t.  Quitting makes it return nil.
! If BODY finishes, `while-no-input' returns whatever value BODY produced."
    (declare (debug t) (indent 0))
    (let ((catch-sym (make-symbol "input")))
      `(with-local-quit
         (catch ',catch-sym
         (let ((throw-on-input ',catch-sym))
!          (or (not (sit-for 0 0 t))
             ,@body))))))
  
  (defmacro combine-after-change-calls (&rest body)