diff options
| author | Chong Yidong | 2006-07-18 01:35:03 +0000 |
|---|---|---|
| committer | Chong Yidong | 2006-07-18 01:35:03 +0000 |
| commit | e18423327e15d044674a9b949a3cb138f6009dbd (patch) | |
| tree | efba1f9a1d6023f44c858da03ef34eadb6c4aca8 | |
| parent | c1fdbde6c8c1e007d5abe6fba012fb1a2c09c448 (diff) | |
| download | emacs-e18423327e15d044674a9b949a3cb138f6009dbd.tar.gz emacs-e18423327e15d044674a9b949a3cb138f6009dbd.zip | |
* commands.texi (Waiting): Document batch-mode sit-for behavior.
| -rw-r--r-- | lispref/ChangeLog | 4 | ||||
| -rw-r--r-- | lispref/commands.texi | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 547789ffc51..6097e352276 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2006-07-17 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * commands.texi (Waiting): Document batch-mode sit-for behavior. | ||
| 4 | |||
| 1 | 2006-07-17 Richard Stallman <rms@gnu.org> | 5 | 2006-07-17 Richard Stallman <rms@gnu.org> |
| 2 | 6 | ||
| 3 | * eval.texi, elisp.texi, text.texi: Use real doublequote inside menus. | 7 | * eval.texi, elisp.texi, text.texi: Use real doublequote inside menus. |
diff --git a/lispref/commands.texi b/lispref/commands.texi index df8eeae9c90..e1c37efa812 100644 --- a/lispref/commands.texi +++ b/lispref/commands.texi | |||
| @@ -2534,9 +2534,10 @@ screen. | |||
| 2534 | @defun sit-for seconds &optional nodisp | 2534 | @defun sit-for seconds &optional nodisp |
| 2535 | This function performs redisplay (provided there is no pending input | 2535 | This function performs redisplay (provided there is no pending input |
| 2536 | from the user), then waits @var{seconds} seconds, or until input is | 2536 | from the user), then waits @var{seconds} seconds, or until input is |
| 2537 | available. The value is @code{t} if @code{sit-for} waited the full | 2537 | available. The usual purpose of @code{sit-for} is to give the user |
| 2538 | time with no input arriving (see @code{input-pending-p} in @ref{Event | 2538 | time to read text that you display. The value is @code{t} if |
| 2539 | Input Misc}). Otherwise, the value is @code{nil}. | 2539 | @code{sit-for} waited the full time with no input arriving |
| 2540 | (@pxref{Event Input Misc}). Otherwise, the value is @code{nil}. | ||
| 2540 | 2541 | ||
| 2541 | The argument @var{seconds} need not be an integer. If it is a floating | 2542 | The argument @var{seconds} need not be an integer. If it is a floating |
| 2542 | point number, @code{sit-for} waits for a fractional number of seconds. | 2543 | point number, @code{sit-for} waits for a fractional number of seconds. |
| @@ -2551,8 +2552,9 @@ If @var{nodisp} is non-@code{nil}, then @code{sit-for} does not | |||
| 2551 | redisplay, but it still returns as soon as input is available (or when | 2552 | redisplay, but it still returns as soon as input is available (or when |
| 2552 | the timeout elapses). | 2553 | the timeout elapses). |
| 2553 | 2554 | ||
| 2554 | The usual purpose of @code{sit-for} is to give the user time to read | 2555 | In batch mode (@pxref{Batch Mode}), @code{sit-for} cannot be |
| 2555 | text that you display. | 2556 | interrupted, even by input from the standard input descriptor. It is |
| 2557 | thus equivalent to @code{sleep-for}, which is described below. | ||
| 2556 | 2558 | ||
| 2557 | It is also possible to call @code{sit-for} with three arguments, | 2559 | It is also possible to call @code{sit-for} with three arguments, |
| 2558 | as @code{(sit-for @var{seconds} @var{millisec} @var{nodisp})}, | 2560 | as @code{(sit-for @var{seconds} @var{millisec} @var{nodisp})}, |