summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan D <jan.h.d@swipnet.se>2010-08-11 20:47:34 +0200
committerJan D <jan.h.d@swipnet.se>2010-08-11 20:47:34 +0200
commit94dff98f390e81caedf9a79949c89f4c6e9ca56c (patch)
treeaacc8e46ef4d5e04e312dedd47c6ad115a6da25c
parent3a46642b081c504b6e25c65d81999fcc0dff5fb2 (diff)
downloademacs-94dff98f390e81caedf9a79949c89f4c6e9ca56c.tar.gz
emacs-94dff98f390e81caedf9a79949c89f4c6e9ca56c.tar.bz2
emacs-94dff98f390e81caedf9a79949c89f4c6e9ca56c.zip
* xfns.c (Fx_hide_tip): Check FRAME_LIVE_P (f) before calling xg_hide_tooltip.
-rw-r--r--src/ChangeLog1
-rw-r--r--src/xfns.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 1275b4a8def..7e8959d4b61 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
* xfns.c (x_defined_color): If USE_GTK, call xg_check_special_colors
first.
+ (Fx_hide_tip): Check FRAME_LIVE_P (f) before calling xg_hide_tooltip.
* gtkutil.h (xg_check_special_colors): Declare.
diff --git a/src/xfns.c b/src/xfns.c
index 8544d9e3e10..e2d571a847f 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5237,7 +5237,7 @@ Value is t if tooltip was open, nil otherwise. */)
/* When using system tooltip, tip_frame is the Emacs frame on which
the tip is shown. */
f = XFRAME (frame);
- if (xg_hide_tooltip (f))
+ if (FRAME_LIVE_P (f) && xg_hide_tooltip (f))
frame = Qnil;
#endif