diff options
| author | Eli Zaretskii | 2006-09-09 10:43:49 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2006-09-09 10:43:49 +0000 |
| commit | 33aba6a0e3bb41a0840b4dc0b3dd1e8a44577a0f (patch) | |
| tree | 8a961f8e3e064eb5e5ee85eba54633bcc2847910 | |
| parent | c98557ae615167cf93075d5c28dc18a281db1472 (diff) | |
| download | emacs-33aba6a0e3bb41a0840b4dc0b3dd1e8a44577a0f.tar.gz emacs-33aba6a0e3bb41a0840b4dc0b3dd1e8a44577a0f.zip | |
(life-display-generation): Test for input manually if `sleeptime' is negative
or null.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/play/life.el | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a52ffebadfa..c81c9cb895c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2006-09-09 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org> | 1 | 2006-09-09 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org> |
| 2 | 2 | ||
| 3 | * play/life.el (life-display-generation): Test for input manually if | ||
| 4 | `sleeptime' is negative or null. | ||
| 5 | |||
| 3 | * lpr.el (lpr-page-header-switches): Page title switch is one of them. | 6 | * lpr.el (lpr-page-header-switches): Page title switch is one of them. |
| 4 | (print-region-1): Substitute `%s' with the page title. | 7 | (print-region-1): Substitute `%s' with the page title. |
| 5 | 8 | ||
diff --git a/lisp/play/life.el b/lisp/play/life.el index 263c4450c9d..a034c387400 100644 --- a/lisp/play/life.el +++ b/lisp/play/life.el | |||
| @@ -269,7 +269,8 @@ generations (this defaults to 1)." | |||
| 269 | (recenter 0) | 269 | (recenter 0) |
| 270 | 270 | ||
| 271 | ;; Redisplay; if the user has hit a key, exit the loop. | 271 | ;; Redisplay; if the user has hit a key, exit the loop. |
| 272 | (or (eq t (sit-for sleeptime)) | 272 | (or (and (sit-for sleeptime) (< 0 sleeptime)) |
| 273 | (not (input-pending-p)) | ||
| 273 | (throw 'life-exit nil))) | 274 | (throw 'life-exit nil))) |
| 274 | 275 | ||
| 275 | (defun life-extinct-quit () | 276 | (defun life-extinct-quit () |