aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-10-04 14:27:37 -0400
committerGlenn Morris2012-10-04 14:27:37 -0400
commit8d956cef2430d5aad817e82308e2a061c07cc857 (patch)
tree748cc74df964b121caf225872451fedb3a7371d9
parentca347e3d404f2da60d955762a7b12de387816560 (diff)
downloademacs-8d956cef2430d5aad817e82308e2a061c07cc857.tar.gz
emacs-8d956cef2430d5aad817e82308e2a061c07cc857.zip
* lisp/emacs-lisp/timer.el (with-timeout): Add missing progn. (Bug#12577)
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/timer.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 37985d5ee38..c569b3c9f05 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-10-04 Glenn Morris <rgm@gnu.org>
2
3 * emacs-lisp/timer.el (with-timeout): Add missing progn. (Bug#12577)
4
12012-10-01 Juanma Barranquero <lekktu@gmail.com> 52012-10-01 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * ido.el (ido-directory-too-big-p): Pass dir through file-truename 7 * 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.
425 (with-timeout-timers 425 (with-timeout-timers
426 (cons -with-timeout-timer- with-timeout-timers))) 426 (cons -with-timeout-timer- with-timeout-timers)))
427 (unwind-protect 427 (unwind-protect
428 ,@body 428 (progn ,@body)
429 (cancel-timer -with-timeout-timer-)))))) 429 (cancel-timer -with-timeout-timer-))))))
430 ;; It is tempting to avoid the `if' altogether and instead run 430 ;; It is tempting to avoid the `if' altogether and instead run
431 ;; timeout-forms in the timer, just before throwing `timeout'. 431 ;; timeout-forms in the timer, just before throwing `timeout'.