# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 780713925 0
# Node ID 44b44e900cf129b987089301a331dfd71177a048
# Parent  cdbd78e42e03c8fd6b40feeab2cf981c4a973d0f
(x_set_scroll_bar_width): Nil now means 2 columns' worth of pixels.
(Fx_create_frame): Default scroll bar width is now nil.

diff -r cdbd78e42e03 -r 44b44e900cf1 src/xfns.c
--- a/src/xfns.c	Wed Sep 28 00:58:15 1994 +0000
+++ b/src/xfns.c	Wed Sep 28 00:58:45 1994 +0000
@@ -1388,7 +1388,13 @@
      struct frame *f;
      Lisp_Object arg, oldval;
 {
-  if (XFASTINT (arg) != FRAME_SCROLL_BAR_PIXEL_WIDTH (f))
+  if (NILP (arg))
+    {
+      FRAME_SCROLL_BAR_PIXEL_WIDTH (f) = 0;
+      FRAME_SCROLL_BAR_COLS (f) = 2;
+    }
+  else if (INTEGERP (arg) && XINT (arg) > 0
+	   && XFASTINT (arg) != FRAME_SCROLL_BAR_PIXEL_WIDTH (f))
     {
       int wid = FONT_WIDTH (f->display.x->font);
       FRAME_SCROLL_BAR_PIXEL_WIDTH (f) = XFASTINT (arg);
@@ -2395,7 +2401,7 @@
 
   x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1),
 		       "menuBar", "MenuBar", number);
-  x_default_parameter (f, parms, Qscroll_bar_width, make_number (12),
+  x_default_parameter (f, parms, Qscroll_bar_width, Qnil,
 		       "scrollBarWidth", "ScrollBarWidth", number);
 
   f->display.x->parent_desc = ROOT_WINDOW;