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

Don't let delete_frame select a tooltip frame (Bug#27647)

Browse source 
* src/frame.c (delete_frame): Don't select a tooltip
frame. (Bug#27647)
This commit is contained in:
Martin Rudalics 2017-11-18 19:19:32 +01:00
parent e9dd580cc8
commit 6e6bf60eab
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/frame.c
View file

@ -1920,6 +1920,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=15025. */ See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=15025. */
FOR_EACH_FRAME (tail, frame1) FOR_EACH_FRAME (tail, frame1)
if (!EQ (frame, frame1) if (!EQ (frame, frame1)
&& NILP (Fframe_parameter (frame1, Qtooltip))
&& (FRAME_TERMINAL (XFRAME (frame)) && (FRAME_TERMINAL (XFRAME (frame))
== FRAME_TERMINAL (XFRAME (frame1))) == FRAME_TERMINAL (XFRAME (frame1)))
&& FRAME_VISIBLE_P (XFRAME (frame1))) && FRAME_VISIBLE_P (XFRAME (frame1)))
@ -1930,7 +1931,9 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
{ {
FOR_EACH_FRAME (tail, frame1) 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. */ /* Do not change a text terminal's top-frame. */
struct frame *f1 = XFRAME (frame1); struct frame *f1 = XFRAME (frame1);