* xterm.c (x_make_frame_visible): Restore hack which is needed when

[gnu-emacs] / src / xfns.c

diff --git a/src/xfns.c b/src/xfns.c
index 2830a79972c15a5d60a9b3abb5c4c720ddaf79d3..7200c5fb2e7c9fb5186414a390c54574c0ee7132 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3069,6 +3069,17 @@ This function is an internal primitive--use `make-frame' instead.  */)
      happen.  */
   init_frame_faces (f);
 
+  /* PXW: This is a duplicate from below.  We have to do it here since
+     otherwise x_set_tool_bar_lines will work with the character sizes
+     installed by init_frame_faces while the frame's pixel size is still
+     calculated from a character size of 1 and we subsequently hit the
+     eassert (height >= 0) assertion in window_box_height.  The
+     non-pixelwise code apparently worked around this because it had one
+     frame line vs one toolbar line which left us with a zero root
+     window height which was obviously wrong as well ...  */
+  change_frame_size (f, FRAME_COLS (f) * FRAME_COLUMN_WIDTH (f),
+                    FRAME_LINES (f) * FRAME_LINE_HEIGHT (f), 1, 0, 0, 1);
+
   /* Set the menu-bar-lines and tool-bar-lines parameters.  We don't
      look up the X resources controlling the menu-bar and tool-bar
      here; they are processed specially at startup, and reflected in