summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/timer.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-10-04 14:27:37 -0400
committerGlenn Morris <rgm@gnu.org>2012-10-04 14:27:37 -0400
commit8d956cef2430d5aad817e82308e2a061c07cc857 (patch)
tree748cc74df964b121caf225872451fedb3a7371d9 /lisp/emacs-lisp/timer.el
parentca347e3d404f2da60d955762a7b12de387816560 (diff)
downloademacs-8d956cef2430d5aad817e82308e2a061c07cc857.tar.gz
emacs-8d956cef2430d5aad817e82308e2a061c07cc857.tar.bz2
emacs-8d956cef2430d5aad817e82308e2a061c07cc857.zip
* lisp/emacs-lisp/timer.el (with-timeout): Add missing progn. (Bug#12577)
Diffstat (limited to 'lisp/emacs-lisp/timer.el')
-rw-r--r--lisp/emacs-lisp/timer.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index b6b7c266263..3aa7ab330e7 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -425,7 +425,7 @@ be detected.
(with-timeout-timers
(cons -with-timeout-timer- with-timeout-timers)))
(unwind-protect
- ,@body
+ (progn ,@body)
(cancel-timer -with-timeout-timer-))))))
;; It is tempting to avoid the `if' altogether and instead run
;; timeout-forms in the timer, just before throwing `timeout'.