summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/subr.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2902d9281fb..b91d17ba8a3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-17 Barry O'Reilly <gundaetiapo@gmail.com>
+
+ * lisp/subr.el (sit-for): Call (input-pending-p t) so as to behave
+ as before.
+
2013-10-18 Reuben Thomas <rrt@sc3d.org>
* textmodes/remember.el (remember): set buffer-offer-save in
diff --git a/lisp/subr.el b/lisp/subr.el
index 0d03e9a88c1..952b9b601dc 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2222,7 +2222,7 @@ floating point support."
(noninteractive
(sleep-for seconds)
t)
- ((input-pending-p)
+ ((input-pending-p t)
nil)
((<= seconds 0)
(or nodisp (redisplay)))