Commit 2e66013d authored by Federico Tedin's avatar Federico Tedin Committed by Eli Zaretskii

Ensure minibuffer input is added to history in read_minibuf

* src/minibuf.c (read_minibuf): Parse input string after saving
the string to the history list instead of before, in case parsing
signals an error or is interrupted by C-g.  (Bug#39291)
parent de411615
Pipeline #4722 passed with stage
in 88 minutes and 56 seconds
......@@ -696,10 +696,6 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
else
histstring = Qnil;
/* If Lisp form desired instead of string, parse it. */
if (expflag)
val = string_to_object (val, defalt);
/* The appropriate frame will get selected
in set-window-configuration. */
unbind_to (count, Qnil);
......@@ -710,6 +706,10 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
if (! (NILP (Vhistory_add_new_input) || NILP (histstring)))
call2 (intern ("add-to-history"), histvar, histstring);
/* If Lisp form desired instead of string, parse it. */
if (expflag)
val = string_to_object (val, defalt);
return val;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment