diff options
| author | Stefan Monnier | 2014-05-18 08:58:30 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2014-05-18 08:58:30 -0400 |
| commit | 08a2434e2f7a60fc558e052e37409333582504cb (patch) | |
| tree | 0fdc023b08f78ad8fbd3950777fdf52e389fb298 /lisp/ChangeLog | |
| parent | 2f826609630cc1bf1d470428273711ebde9eec3c (diff) | |
| download | emacs-08a2434e2f7a60fc558e052e37409333582504cb.tar.gz emacs-08a2434e2f7a60fc558e052e37409333582504cb.zip | |
* lisp/emacs-lisp/timer.el (timer-event-handler): Don't run if canceled.
Fixes: debbugs:17392
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9205d3a73ea..90335fda706 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-05-18 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * emacs-lisp/timer.el (timer-event-handler): Don't run if canceled | ||
| 4 | (bug#17392). | ||
| 5 | |||
| 1 | 2014-05-17 Michael Albinus <michael.albinus@gmx.de> | 6 | 2014-05-17 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 7 | ||
| 3 | * net/tramp-sh.el (tramp-find-inline-encoding): Do not match "%%t" | 8 | * net/tramp-sh.el (tramp-find-inline-encoding): Do not match "%%t" |