[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108156: * lisp/emacs-lisp/timer.el (with-timeout): Add missing progn. (Bug#12577)

[Glenn Morris]

------------------------------------------------------------
revno: 108156
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Thu 2012-10-04 14:27:37 -0400
message:
  * lisp/emacs-lisp/timer.el (with-timeout): Add missing progn.  (Bug#12577)
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/timer.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-01 02:45:25 +0000
+++ b/lisp/ChangeLog    2012-10-04 18:27:37 +0000
@@ -1,3 +1,7 @@
+2012-10-04  Glenn Morris  <address@hidden>
+
+       * emacs-lisp/timer.el (with-timeout): Add missing progn.  (Bug#12577)
+
 2012-10-01  Juanma Barranquero  <address@hidden>
 
        * ido.el (ido-directory-too-big-p): Pass dir through file-truename

=== modified file 'lisp/emacs-lisp/timer.el'
--- a/lisp/emacs-lisp/timer.el  2012-01-19 07:21:25 +0000
+++ b/lisp/emacs-lisp/timer.el  2012-10-04 18:27:37 +0000
@@ -425,7 +425,7 @@
                      (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'.