# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 867991693 0
# Node ID 5ca5ff1c74eb0e93af7386c2bc8f32acbc85d0af
# Parent  3c958a136c4a451f2cb1bb8fadd0c45a9a86943f
(x_set_scroll_bar_width): By default, use enough
columns to give 14 or more pixels.

diff -r 3c958a136c4a -r 5ca5ff1c74eb src/xfns.c
--- a/src/xfns.c	Fri Jul 04 04:47:05 1997 +0000
+++ b/src/xfns.c	Fri Jul 04 04:48:13 1997 +0000
@@ -1986,18 +1986,23 @@
      struct frame *f;
      Lisp_Object arg, oldval;
 {
+  int wid = FONT_WIDTH (f->output_data.x->font);
+
   if (NILP (arg))
     {
+      /* Make the actual width at least 14 pixels
+	 and a multiple of a character width.  */
+      FRAME_SCROLL_BAR_COLS (f) = (14 + wid - 1) / wid;
+      /* Use all of that space (aside from required margins)
+	 for the scroll bar.  */
       FRAME_SCROLL_BAR_PIXEL_WIDTH (f) = 0;
-      FRAME_SCROLL_BAR_COLS (f) = 3;
+
       if (FRAME_X_WINDOW (f))
         x_set_window_size (f, 0, FRAME_WIDTH (f), FRAME_HEIGHT (f));
     }
   else if (INTEGERP (arg) && XINT (arg) > 0
 	   && XFASTINT (arg) != FRAME_SCROLL_BAR_PIXEL_WIDTH (f))
     {
-      int wid = FONT_WIDTH (f->output_data.x->font);
-
       if (XFASTINT (arg) <= 2 * VERTICAL_SCROLL_BAR_WIDTH_TRIM)
 	XSETINT (arg, 2 * VERTICAL_SCROLL_BAR_WIDTH_TRIM + 1);