emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-27 f43e9ad: Avoid crashes in the daemon due to user interaction


From: Eli Zaretskii
Subject: emacs-27 f43e9ad: Avoid crashes in the daemon due to user interaction
Date: Wed, 11 Nov 2020 14:47:25 -0500 (EST)

branch: emacs-27
commit f43e9ad524b5d23dd9434e5d70bd95142207d601
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    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)
---
 src/minibuf.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/minibuf.c b/src/minibuf.c
index b837cc5..1356550 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;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]