# HG changeset patch
# User Johan Bockg���rd <bojohan@gnu.org>
# Date 1204992020 0
# Node ID 7d73fa3b38bea0a4aff8a8a0b347965a02a05870
# Parent  842d7b2745f7204c82f826b8432e02307cfa2453
(while-no-input): Don't splice BODY directly into the `or' form.

diff -r 842d7b2745f7 -r 7d73fa3b38be lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Mar 08 15:55:51 2008 +0000
+++ b/lisp/ChangeLog	Sat Mar 08 16:00:20 2008 +0000
@@ -1,3 +1,8 @@
+2008-03-08  Johan Bockg$(Q)[(Brd  <bojohan@gnu.org>
+
+	* subr.el (while-no-input): Don't splice BODY directly into the
+	`or' form.
+
 2008-03-06  Kim F. Storm  <storm@cua.dk>
 
 	* help.el (view-emacs-todo): Rename from view-todo.  Change users.
diff -r 842d7b2745f7 -r 7d73fa3b38be lisp/subr.el
--- a/lisp/subr.el	Sat Mar 08 15:55:51 2008 +0000
+++ b/lisp/subr.el	Sat Mar 08 16:00:20 2008 +0000
@@ -2478,7 +2478,7 @@
        (catch ',catch-sym
 	 (let ((throw-on-input ',catch-sym))
 	   (or (input-pending-p)
-	       ,@body))))))
+	       (progn ,@body)))))))
 
 (defmacro combine-after-change-calls (&rest body)
   "Execute BODY, but don't call the after-change functions till the end.