From 466169b9f679a78aec00f9735335d90718c0d898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miha=20Rihtar=C5=A1i=C4=8D?= Date: Tue, 8 Jun 2021 20:19:44 +0200 Subject: [PATCH 2/2] Don't bind minibuffer-completion-table to nil in read-string This reverts 2012-06-19 "* src/minibuf.c (Fread_string): Bind minibuffer-completion-table." * src/minibuf.c (Fread_string): Don't bind minibuffer-completion-table to nil. --- src/minibuf.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/minibuf.c b/src/minibuf.c index 00069eabbe..adee471887 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1376,20 +1376,13 @@ DEFUN ("read-string", Fread_string, Sread_string, 1, 5, 0, (Lisp_Object prompt, Lisp_Object initial_input, Lisp_Object history, Lisp_Object default_value, Lisp_Object inherit_input_method) { Lisp_Object val; - ptrdiff_t count = SPECPDL_INDEX (); - - /* Just in case we're in a recursive minibuffer, make it clear that the - previous minibuffer's completion table does not apply to the new - minibuffer. - FIXME: `minibuffer-completion-table' should be buffer-local instead. */ - specbind (Qminibuffer_completion_table, Qnil); val = Fread_from_minibuffer (prompt, initial_input, Qnil, Qnil, history, default_value, inherit_input_method); if (STRINGP (val) && SCHARS (val) == 0 && ! NILP (default_value)) val = CONSP (default_value) ? XCAR (default_value) : default_value; - return unbind_to (count, val); + return val; } DEFUN ("read-command", Fread_command, Sread_command, 1, 2, 0, -- 2.31.1