[Emacs-diffs] Changes to emacs/lisp/subr.el,v

[Chong Yidong]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      06/07/26 18:18:26

Index: subr.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/subr.el,v
retrieving revision 1.522
retrieving revision 1.523
diff -u -b -r1.522 -r1.523
--- subr.el     24 Jul 2006 17:01:08 -0000      1.522
+++ subr.el     26 Jul 2006 18:18:26 -0000      1.523
@@ -1737,19 +1737,9 @@
       (progn (sleep-for seconds) t)
     (unless nodisp (redisplay))
     (or (<= seconds 0)
-       (let ((timer (timer-create))
-             (echo-keystrokes 0))
-         (if (catch 'sit-for-timeout
-               (timer-set-time timer (timer-relative-time
-                                      (current-time) seconds))
-               (timer-set-function timer 'with-timeout-handler
-                                   '(sit-for-timeout))
-               (timer-activate timer)
-               (push (read-event) unread-command-events)
-               nil)
-             t
-           (cancel-timer timer)
-           nil)))))
+       (let ((read (read-event nil nil seconds)))
+         (or (null read)
+             (progn (push read unread-command-events) nil))))))
 
 ;;; Atomic change groups.