# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 783723911 0
# Node ID 4c43c9dbe130fdc9994fa5bf0bfcbe1ee58d40b8
# Parent  d5fa87d62d62b34b4117eccdb188ba6b2245e42d
(x_window): Make ibw 0 by default.

(Fx_create_frame): Don't set xlwmenu_default_font if not USE_X_TOOLKIT.

diff -r d5fa87d62d62 -r 4c43c9dbe130 src/xfns.c
--- a/src/xfns.c	Tue Nov 01 21:04:29 1994 +0000
+++ b/src/xfns.c	Tue Nov 01 21:05:11 1994 +0000
@@ -2266,7 +2266,7 @@
 
     if (FRAME_EXTERNAL_MENU_BAR (f))
       {
-        Dimension ibw;
+        Dimension ibw = 0;
         XtVaGetValues (pane_widget, XtNinternalBorderWidth, &ibw, NULL);
         menubar_size += ibw;
       }
@@ -2667,9 +2667,11 @@
 			 "font", "Font", string);
   }
 
+#ifdef USE_X_TOOLKIT
   /* Prevent lwlib/xlwmenu.c from crashing because of a bug
      whereby it fails to get any font.  */
   xlwmenu_default_font = f->display.x->font;
+#endif
 
   x_default_parameter (f, parms, Qborder_width, make_number (2),
 		       "borderwidth", "BorderWidth", number);