emacs-diffs
[Top][All Lists]
Advanced

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

[Emacs-diffs] emacs-26 6e6bf60: Don't let delete_frame select a tooltip


From: Martin Rudalics
Subject: [Emacs-diffs] emacs-26 6e6bf60: Don't let delete_frame select a tooltip frame (Bug#27647)
Date: Sat, 18 Nov 2017 13:20:35 -0500 (EST)

branch: emacs-26
commit 6e6bf60eab1e921605064e3d39ea080639f8e0f6
Author: Martin Rudalics <address@hidden>
Commit: Martin Rudalics <address@hidden>

    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 2b32751..aacb27e 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);



reply via email to

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