From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 11 Nov 2020 19:46:43 +0000 (+0200)
Subject: Avoid crashes in the daemon due to user interaction
X-Git-Tag: emacs-27.1.90~63
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f43e9ad524b5d23dd9434e5d70bd95142207d601;p=emacs.git

Avoid crashes in the daemon due to user interaction

* 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)
---

diff --git a/src/minibuf.c b/src/minibuf.c
index b837cc53eb9..135655064a3 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -666,7 +666,8 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
   /* If cursor is on the minibuffer line,
      show the user we have exited by putting it in column 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.x = 0;