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

* src/minibuf.c (read_minibuf): Use user-error

Browse source
This commit is contained in:
Stefan Monnier 2019-12-23 23:47:54 -05:00
parent 60fba710c5
commit a6b41a817e
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/minibuf.c
View file

@ -414,12 +414,13 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
if (!enable_recursive_minibuffers
&& minibuf_level > 0)
{
Lisp_Object str = build_string ("Command attempted to use minibuffer"
"while in minibuffer");
if (EQ (selected_window, minibuf_window))
error ("Command attempted to use minibuffer while in minibuffer");
Fsignal (Quser_error, (list1 (str)));
else
/* If we're in another window, cancel the minibuffer that's active. */
Fthrow (Qexit,
build_string ("Command attempted to use minibuffer while in minibuffer"));
Fthrow (Qexit, str);
}
if ((noninteractive