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

diff --git a/src/ChangeLog b/src/ChangeLog
index a3390bcbc5bed12c92fea4ad4112e22310b88e83..8ae281193bc5ed72ea322751fc65ade446c964dc 100644 (file)
--- 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 5adab80245c3575062b2464b493cb06d98ae1342..f5c0a5dcc70a6932a32aa07d6bb320ac0a7a4834 100644 (file)
--- 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,