From 08a2434e2f7a60fc558e052e37409333582504cb Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 18 May 2014 08:58:30 -0400 Subject: * lisp/emacs-lisp/timer.el (timer-event-handler): Don't run if canceled. Fixes: debbugs:17392 --- src/minibuf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/minibuf.c') 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; -- cgit v1.2.1