2 files changed, 6 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index eab72435508..ca642ac01c1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 1999-12-22  Gerd Moellmann  <gerd@gnu.org>
 
+        * xfns.c (Fx_create_frame): Move x_default_parameter calls that
+        lead to size changes to after the X window has been created.
+
         * xfaces.c (realize_x_face): Don't use uninitialized local
         variable in xassert.
 
diff --git a/src/xfns.c b/src/xfns.c
index 2f06de41ff4..33489df994e 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3766,9 +3766,6 @@ This function is an internal primitive--use `make-frame' instead.")
                        "menuBar", "MenuBar", RES_TYPE_NUMBER);
   x_default_parameter (f, parms, Qtool_bar_lines, make_number (0),
                        "toolBar", "ToolBar", RES_TYPE_NUMBER);
-  x_default_parameter (f, parms, Qscroll_bar_width, Qnil,
-                       "scrollBarWidth", "ScrollBarWidth",
-                       RES_TYPE_NUMBER);
   x_default_parameter (f, parms, Qbuffer_predicate, Qnil,
                        "bufferPredicate", "BufferPredicate",
                        RES_TYPE_SYMBOL);
@@ -3830,6 +3827,9 @@ This function is an internal primitive--use `make-frame' instead.")
                        "autoLower", "AutoRaiseLower", RES_TYPE_BOOLEAN);
   x_default_parameter (f, parms, Qcursor_type, Qbox,
                        "cursorType", "CursorType", RES_TYPE_SYMBOL);
+  x_default_parameter (f, parms, Qscroll_bar_width, Qnil,
+                       "scrollBarWidth", "ScrollBarWidth",
+                       RES_TYPE_NUMBER);
 
   /* Dimensions, especially f->height, must be done via change_frame_size.
      Change will not be effected unless different from the current