* lisp/emacs-lisp/timer.el (timer-event-handler): Don't retrigger a canceled

[bpt/emacs.git] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a2be105..f5cf9d0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/timer.el (timer-event-handler): Don't retrigger a canceled
+       timer (bug#14156).
+
 2013-04-07  Nic Ferrier  <nferrier@ferrier.me.uk>
 
        * emacs-lisp/ert.el (should, should-not, should-error): Add edebug