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

[Juanma Barranquero]

Index: emacs/lisp/emacs-lisp/timer.el
diff -c emacs/lisp/emacs-lisp/timer.el:1.5 emacs/lisp/emacs-lisp/timer.el:1.6
*** emacs/lisp/emacs-lisp/timer.el:1.5  Wed Feb  9 15:50:40 2005
--- emacs/lisp/emacs-lisp/timer.el      Mon Jul  4 01:22:30 2005
***************
*** 408,419 ****
  (defmacro with-timeout (list &rest body)
    "Run BODY, but if it doesn't finish in SECONDS seconds, give up.
  If we give up, we run the TIMEOUT-FORMS and return the value of the last one.
- The call should look like:
-  (with-timeout (SECONDS TIMEOUT-FORMS...) BODY...)
  The timeout is checked whenever Emacs waits for some kind of external
! event \(such as keyboard input, input from subprocesses, or a certain time);
  if the program loops without waiting in any way, the timeout will not
! be detected."
    (let ((seconds (car list))
        (timeout-forms (cdr list)))
      `(let ((with-timeout-tag (cons nil nil))
--- 408,418 ----
  (defmacro with-timeout (list &rest body)
    "Run BODY, but if it doesn't finish in SECONDS seconds, give up.
  If we give up, we run the TIMEOUT-FORMS and return the value of the last one.
  The timeout is checked whenever Emacs waits for some kind of external
! event (such as keyboard input, input from subprocesses, or a certain time);
  if the program loops without waiting in any way, the timeout will not
! be detected.
! \n(fn (SECONDS TIMEOUT-FORMS...) BODY)"
    (let ((seconds (car list))
        (timeout-forms (cdr list)))
      `(let ((with-timeout-tag (cons nil nil))