From 6e6bf60eab1e921605064e3d39ea080639f8e0f6 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Sat, 18 Nov 2017 19:19:32 +0100 Subject: [PATCH] Don't let delete_frame select a tooltip frame (Bug#27647) * src/frame.c (delete_frame): Don't select a tooltip frame. (Bug#27647) --- src/frame.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/frame.c b/src/frame.c index 2b32751c0d3..aacb27ec790 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1920,6 +1920,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force) See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=15025. */ FOR_EACH_FRAME (tail, frame1) if (!EQ (frame, frame1) + && NILP (Fframe_parameter (frame1, Qtooltip)) && (FRAME_TERMINAL (XFRAME (frame)) == FRAME_TERMINAL (XFRAME (frame1))) && FRAME_VISIBLE_P (XFRAME (frame1))) @@ -1930,7 +1931,9 @@ delete_frame (Lisp_Object frame, Lisp_Object force) { FOR_EACH_FRAME (tail, frame1) { - if (! EQ (frame, frame1) && FRAME_LIVE_P (XFRAME (frame1))) + if (!EQ (frame, frame1) + && FRAME_LIVE_P (XFRAME (frame1)) + && NILP (Fframe_parameter (frame1, Qtooltip))) { /* Do not change a text terminal's top-frame. */ struct frame *f1 = XFRAME (frame1); -- 2.39.2