* lisp/emacs-lisp/timer.el (with-timeout): Add missing progn. (Bug#12577)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 37985d5ee382af8dd89813f62a8176bbf59bd061..c569b3c9f0579038fbd5366d702a658737b6959b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-04  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-lisp/timer.el (with-timeout): Add missing progn.  (Bug#12577)
+
 2012-10-01  Juanma Barranquero  <lekktu@gmail.com>
 
        * ido.el (ido-directory-too-big-p): Pass dir through file-truename

diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index b6b7c266263e115736aad397868159f389f209c0..3aa7ab330e7ac924c748d2294fc408b61e00b3e8 100644 (file)
--- 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'.