2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df60dfec6f4..73cb70ceba0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/subr.el b/lisp/subr.el
index 329c4ca2c24..2f9cdd769e0 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2478,7 +2478,7 @@ If BODY finishes, `while-no-input' returns whatever value BODY produced."
        (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.