diff options
| author | Johan Bockgård <bojohan@gnu.org> | 2008-03-08 16:00:20 +0000 |
|---|---|---|
| committer | Johan Bockgård <bojohan@gnu.org> | 2008-03-08 16:00:20 +0000 |
| commit | 8db8d2a130caa52fac45fbc27e9037a0c28fa3ad (patch) | |
| tree | fba9b3b5567a0633f40233aec87e94e85bb081fc | |
| parent | f2549aa0236872e4f0efd29eebc49ccce29f5408 (diff) | |
| download | emacs-8db8d2a130caa52fac45fbc27e9037a0c28fa3ad.tar.gz | |
(while-no-input): Don't splice BODY directly into the `or' form.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/subr.el | 2 |
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. |