diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-05-18 08:58:30 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-05-18 08:58:30 -0400 |
| commit | 08a2434e2f7a60fc558e052e37409333582504cb (patch) | |
| tree | 0fdc023b08f78ad8fbd3950777fdf52e389fb298 /src | |
| parent | 2f826609630cc1bf1d470428273711ebde9eec3c (diff) | |
| download | emacs-08a2434e2f7a60fc558e052e37409333582504cb.tar.gz | |
* lisp/emacs-lisp/timer.el (timer-event-handler): Don't run if canceled.
Fixes: debbugs:17392
Diffstat (limited to 'src')
| -rw-r--r-- | src/minibuf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index cd108d88ecc..c3fcbeb59c7 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -396,7 +396,8 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt, in previous recursive minibuffer, but was not set explicitly to t for this invocation, so set it to nil in this minibuffer. Save the old value now, before we change it. */ - specbind (intern ("minibuffer-completing-file-name"), Vminibuffer_completing_file_name); + specbind (intern ("minibuffer-completing-file-name"), + Vminibuffer_completing_file_name); if (EQ (Vminibuffer_completing_file_name, Qlambda)) Vminibuffer_completing_file_name = Qnil; |