diff options
| author | Chong Yidong | 2006-10-10 01:20:20 +0000 |
|---|---|---|
| committer | Chong Yidong | 2006-10-10 01:20:20 +0000 |
| commit | 2bcac7667a8d99b3ff897eaa0efe11b79b074c0c (patch) | |
| tree | c7c192ea949955fe1b977fbc185d77addac3182a /src/dispnew.c | |
| parent | e29d96b65f897a3cef09053c6491116de25cade5 (diff) | |
| download | emacs-2bcac7667a8d99b3ff897eaa0efe11b79b074c0c.tar.gz emacs-2bcac7667a8d99b3ff897eaa0efe11b79b074c0c.zip | |
* dispnew.c (sit_for): Sit forever if TIMEOUT is t.
* keyboard.c (command_loop_1): Handle non-number values of
`minibuffer-message-timeout'.
(Fexecute_extended_command): Fix typo.
* minibuf.c (temp_echo_area_glyphs): Sit for
`minibuffer-message-timeout' seconds.
Diffstat (limited to 'src/dispnew.c')
| -rw-r--r-- | src/dispnew.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/dispnew.c b/src/dispnew.c index 02a3aedaf11..59f109df45b 100644 --- a/src/dispnew.c +++ b/src/dispnew.c | |||
| @@ -6502,7 +6502,8 @@ Emacs was built without floating point support. | |||
| 6502 | /* This is just like wait_reading_process_output, except that | 6502 | /* This is just like wait_reading_process_output, except that |
| 6503 | it does redisplay. | 6503 | it does redisplay. |
| 6504 | 6504 | ||
| 6505 | TIMEOUT is number of seconds to wait (float or integer). | 6505 | TIMEOUT is number of seconds to wait (float or integer), |
| 6506 | or t to wait forever. | ||
| 6506 | READING is 1 if reading input. | 6507 | READING is 1 if reading input. |
| 6507 | If DO_DISPLAY is >0 display process output while waiting. | 6508 | If DO_DISPLAY is >0 display process output while waiting. |
| 6508 | If DO_DISPLAY is >1 perform an initial redisplay before waiting. | 6509 | If DO_DISPLAY is >1 perform an initial redisplay before waiting. |
| @@ -6535,10 +6536,15 @@ sit_for (timeout, reading, do_display) | |||
| 6535 | sec = (int) seconds; | 6536 | sec = (int) seconds; |
| 6536 | usec = (int) ((seconds - sec) * 1000000); | 6537 | usec = (int) ((seconds - sec) * 1000000); |
| 6537 | } | 6538 | } |
| 6539 | else if (EQ (timeout, Qt)) | ||
| 6540 | { | ||
| 6541 | sec = 0; | ||
| 6542 | usec = 0; | ||
| 6543 | } | ||
| 6538 | else | 6544 | else |
| 6539 | wrong_type_argument (Qnumberp, timeout); | 6545 | wrong_type_argument (Qnumberp, timeout); |
| 6540 | 6546 | ||
| 6541 | if (sec == 0 && usec == 0) | 6547 | if (sec == 0 && usec == 0 && !EQ (timeout, Qt)) |
| 6542 | return Qt; | 6548 | return Qt; |
| 6543 | 6549 | ||
| 6544 | #ifdef SIGIO | 6550 | #ifdef SIGIO |