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

Avoid crashes in the daemon due to user interaction

Browse source 
* src/minibuf.c (read_minibuf): Avoid crashes in the daemon if the
init file invokes some kind of minibuffer interaction, by not
updating the selected frame if it's the initial frame.
(Bug#44583)
This commit is contained in:
Eli Zaretskii 2020-11-11 21:46:43 +02:00
parent 658952a57a
commit f43e9ad524
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/minibuf.c
View file

@ -666,7 +666,8 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
/* If cursor is on the minibuffer line, /* If cursor is on the minibuffer line,
show the user we have exited by putting it in column 0. */ show the user we have exited by putting it in column 0. */
if (XWINDOW (minibuf_window)->cursor.vpos >= 0 if (XWINDOW (minibuf_window)->cursor.vpos >= 0
&& !noninteractive) && !noninteractive
&& !FRAME_INITIAL_P (SELECTED_FRAME ()))
{ {
XWINDOW (minibuf_window)->cursor.hpos = 0; XWINDOW (minibuf_window)->cursor.hpos = 0;
XWINDOW (minibuf_window)->cursor.x = 0; XWINDOW (minibuf_window)->cursor.x = 0;