diff options
| author | Johan Bockgård <[email protected]> | 2008-03-08 16:06:25 +0000 |
|---|---|---|
| committer | Johan Bockgård <[email protected]> | 2008-03-08 16:06:25 +0000 |
| commit | ff7d73ac92dbc58de9e2121628c74be1e88e9454 (patch) | |
| tree | 4bc8145da5995b6d49b8b8c603ea9666e2eefec4 | |
| parent | f9f46670af4c9d200f33af1f9fe7031e0fe5babd (diff) | |
(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 c8fc4b869c..7a3ed818b3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-03-08 Johan Bockg$(Q)[(Brd <[email protected]> + + * subr.el (while-no-input): Don't splice BODY directly into the + `or' form. + 2008-03-08 Dan Nicolaescu <[email protected]> * diff-mode.el (diff-ignore-whitespace-hunk): Bind diff --git a/lisp/subr.el b/lisp/subr.el index 79de788c36..0488b41319 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. |