procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure minibuffer input is added to history in read_minibuf

Browse source 
* 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)
This commit is contained in:
Federico Tedin 2020-01-29 22:24:40 +01:00 • committed by Eli Zaretskii
parent de41161534
commit 2e66013dcf
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/minibuf.c
View file

@ -696,10 +696,6 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
else else
histstring = Qnil; 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 /* The appropriate frame will get selected
in set-window-configuration. */ in set-window-configuration. */
unbind_to (count, Qnil); 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))) if (! (NILP (Vhistory_add_new_input) || NILP (histstring)))
call2 (intern ("add-to-history"), histvar, 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; return val;
} }