From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 24 Jan 2001 14:21:11 +0000 (+0000)
Subject: (x_new_font): Don't change a tooltip's size.
X-Git-Tag: emacs-pretest-21.0.96~131
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3497f73e06fb3a7f86ab43aafba610b380a401e6;p=emacs.git

(x_new_font): Don't change a tooltip's size.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a3390bcbc5b..8ae281193bc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2001-01-24  Gerd Moellmann  <gerd@gnu.org>
+
+	* xterm.c (x_new_font): Don't change a tooltip's size.
+
+	* xfns.c (x_create_tip_frame): Prevent changing the tooltip's
+	background color by specifying a color for the default font
+	in .Xdefaults.
+
 2001-01-24  Kenichi Handa  <handa@etl.go.jp>
 
 	* ccl.c (CCL_READ_CHAR): Change the argument name from r to REG as
diff --git a/src/xterm.c b/src/xterm.c
index 5adab80245c..f5c0a5dcc70 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -11449,7 +11449,12 @@ x_new_font (f, fontname)
 		f->output_data.x->font->fid);
 
       frame_update_line_height (f);
-      x_set_window_size (f, 0, f->width, f->height);
+
+      /* Don't change the size of a tip frame; there's no point in
+	 doing it because it's done in Fx_show_tip, and it leads to
+	 problems because the tip frame has no widget.  */
+      if (NILP (tip_frame) || XFRAME (tip_frame) != f)
+	x_set_window_size (f, 0, f->width, f->height);
     }
   else
     /* If we are setting a new frame's font for the first time,