changeset 92621:f32191b4080d

(while-no-input): Don't splice BODY directly into the `or' form.
author Johan Bockgård <bojohan@gnu.org>
date Sat, 08 Mar 2008 16:06:25 +0000
parents 56c940bf55c1
children a7f58647496a
files lisp/ChangeLog lisp/subr.el
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sat Mar 08 15:56:19 2008 +0000
+++ b/lisp/ChangeLog	Sat Mar 08 16:06:25 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-08  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* diff-mode.el (diff-ignore-whitespace-hunk): Bind
--- a/lisp/subr.el	Sat Mar 08 15:56:19 2008 +0000
+++ b/lisp/subr.el	Sat Mar 08 16:06:25 2008 +0000
@@ -2599,7 +2599,7 @@
        (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.