From 8d956cef2430d5aad817e82308e2a061c07cc857 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 4 Oct 2012 14:27:37 -0400 Subject: [PATCH] * lisp/emacs-lisp/timer.el (with-timeout): Add missing progn. (Bug#12577) --- lisp/ChangeLog | 4 ++++ lisp/emacs-lisp/timer.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 + + * emacs-lisp/timer.el (with-timeout): Add missing progn. (Bug#12577) + 2012-10-01 Juanma Barranquero * 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'. -- 2.39.5