diff options
| author | Miles Bader <miles@gnu.org> | 2007-01-26 06:16:11 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-01-26 06:16:11 +0000 |
| commit | c0466914ba3ad88c402b0301646b4b5db8aeb913 (patch) | |
| tree | 964d8df324ab5f46872dfedc92ccea9fe50a1441 /lisp/type-break.el | |
| parent | c97a3f22ed5841f1c8bcdbb80df2bd49635c6a56 (diff) | |
| parent | 58f8a3f97bd49484d0eb4f83a70662ded0daf9cc (diff) | |
| download | emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.tar.gz emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.tar.bz2 emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 586-614)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- Merge from erc--main--0
- Make byte compiler correctly write circular constants
* gnus--rel--5.10 (patch 186-196)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
Diffstat (limited to 'lisp/type-break.el')
| -rw-r--r-- | lisp/type-break.el | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lisp/type-break.el b/lisp/type-break.el index ae18d2eeba4..98851bcab20 100644 --- a/lisp/type-break.el +++ b/lisp/type-break.el @@ -1,7 +1,7 @@ ;;; type-break.el --- encourage rests from typing at appropriate intervals ;; Copyright (C) 1994, 1995, 1997, 2000, 2001, 2002, 2003, -;; 2004, 2005, 2006 Free Software Foundation, Inc. +;; 2004, 2005, 2006, 2007 Free Software Foundation, Inc. ;; Author: Noah Friedman ;; Maintainer: Noah Friedman <friedman@splode.com> @@ -1131,11 +1131,10 @@ With optional non-nil ALL, force redisplay of all mode-lines." (progn (hanoi (/ (window-width) 8)) ;; Wait for user to come back. - (read-char) + (read-event) (kill-buffer "*Hanoi*")) (quit - ;; eat char - (read-char) + (read-event) (and (get-buffer "*Hanoi*") (kill-buffer "*Hanoi*"))))) @@ -1153,11 +1152,10 @@ With optional non-nil ALL, force redisplay of all mode-lines." (progn (life 3) ;; wait for user to return - (read-char) + (read-event) (kill-buffer "*Life*")) (life-extinct (message "%s" (get 'life-extinct 'error-message)) - (sit-for 3) ;; restart demo (setq continue t)) (quit @@ -1246,7 +1244,7 @@ With optional non-nil ALL, force redisplay of all mode-lines." message)))) (goto-char (point-min)) (sit-for 60)) - (read-char) + (read-event) (kill-buffer buffer-name)) (quit (and (get-buffer buffer-name) |