(while-no-input): Don't splice BODY directly into the `or' form.

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c8fc4b869ca..7a3ed818b3e 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-08  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * diff-mode.el (diff-ignore-whitespace-hunk): Bind
diff --git a/lisp/subr.el b/lisp/subr.el
index 79de788c365..0488b41319d 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2599,7 +2599,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 condition-case-no-debug (var bodyform &rest handlers)
   "Like `condition-case' except that it does not catch anything when debugging.