From: Glenn Morris <rgm@gnu.org>
Date: Thu, 4 Oct 2012 18:27:37 +0000 (-0400)
Subject: * lisp/emacs-lisp/timer.el (with-timeout): Add missing progn.  (Bug#12577)
X-Git-Tag: emacs-24.2.90~241^2~13^2~4
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8d956cef2430d5aad817e82308e2a061c07cc857;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 37985d5ee38..c569b3c9f05 100644
--- 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 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'.