[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/subr.el,v
From: |
Kim F. Storm |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/subr.el,v |
Date: |
Mon, 11 Sep 2006 22:21:56 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kim F. Storm <kfstorm> 06/09/11 22:21:55
Index: subr.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/subr.el,v
retrieving revision 1.524
retrieving revision 1.525
diff -u -b -r1.524 -r1.525
--- subr.el 10 Sep 2006 17:45:42 -0000 1.524
+++ subr.el 11 Sep 2006 22:21:55 -0000 1.525
@@ -1737,20 +1737,23 @@
floating point support.
\(fn SECONDS &optional NODISP)"
- (unless (or unread-command-events
- unread-post-input-method-events
- unread-input-method-events
- (>= unread-command-char 0))
(when (or obsolete (numberp nodisp))
(setq seconds (+ seconds (* 1e-3 nodisp)))
(setq nodisp obsolete))
- (if noninteractive
- (progn (sleep-for seconds) t)
- (unless nodisp (redisplay))
- (or (<= seconds 0)
+ (cond
+ (noninteractive
+ (sleep-for seconds)
+ t)
+ ((input-pending-p)
+ nil)
+ ((<= seconds 0)
+ (or nodisp (redisplay)))
+ (t
+ (or nodisp (redisplay))
(let ((read (read-event nil nil seconds)))
(or (null read)
- (progn (push read unread-command-events) nil)))))))
+ (progn (push read unread-command-events)
+ nil))))))
;;; Atomic change groups.
@@ -2398,7 +2401,7 @@
`(with-local-quit
(catch ',catch-sym
(let ((throw-on-input ',catch-sym))
- (or (not (sit-for 0 0 t))
+ (or (input-pending-p)
,@body))))))
(defmacro combine-after-change-calls (&rest body)
- [Emacs-diffs] Changes to emacs/lisp/subr.el,v, Richard M. Stallman, 2006/09/10
- [Emacs-diffs] Changes to emacs/lisp/subr.el,v,
Kim F. Storm <=
- [Emacs-diffs] Changes to emacs/lisp/subr.el,v, Vinicius Jose Latorre, 2006/09/20
- [Emacs-diffs] Changes to emacs/lisp/subr.el,v, Jason Rumney, 2006/09/25
- [Emacs-diffs] Changes to emacs/lisp/subr.el,v, Richard M. Stallman, 2006/09/28