diff options
author | Eli Zaretskii <eliz@gnu.org> | 2017-11-11 14:42:30 +0200 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2017-11-11 14:42:30 +0200 |
commit | 7657a867095f9edbb43c22f979f06dbe880059b7 (patch) | |
tree | ddabb7270ab53f3a2dc7892e11ae9515f702dcd6 /src/xfns.c | |
parent | 603a0716a8824731a689d3b5144b55eed9ee4db4 (diff) | |
download | emacs-7657a867095f9edbb43c22f979f06dbe880059b7.tar.gz |
Fix comparisons with tip_frame in GTK builds
* src/xterm.c (x_update_begin, x_new_font):
* src/xfns.c (Fx_display_monitor_attributes_list):
* src/frame.c (Fframe_list) [USE_GTK]: Don't consider tip_frame a
tooltip frame unless its 'tooltip' parameter is non-nil. (Bug#26747)
Diffstat (limited to 'src/xfns.c')
-rw-r--r-- | src/xfns.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/xfns.c b/src/xfns.c index 9022e4a9674..83fc07dc6cb 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -4915,7 +4915,11 @@ Internal use only, use `display-monitor-attributes-list' instead. */) struct frame *f = XFRAME (frame); if (FRAME_X_P (f) && FRAME_DISPLAY_INFO (f) == dpyinfo - && !EQ (frame, tip_frame)) + && !(EQ (frame, tip_frame) +#ifdef USE_GTK + && !NILP (Fframe_parameter (tip_frame, Qtooltip)) +#endif + )) { GdkWindow *gwin = gtk_widget_get_window (FRAME_GTK_WIDGET (f)); |