# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 781135586 0
# Node ID 60497ceed71acd62b9da213c253908ad1592b808
# Parent  d4ad53f37cc76ea9342106b47617b214fa98efcc
(x_figure_window_size): Use new formula for scroll bar width.

diff -r d4ad53f37cc7 -r 60497ceed71a src/xfns.c
--- a/src/xfns.c	Sun Oct 02 21:51:57 1994 +0000
+++ b/src/xfns.c	Sun Oct 02 22:06:26 1994 +0000
@@ -1769,9 +1769,11 @@
     }
 
   f->display.x->vertical_scroll_bar_extra
-    = (FRAME_HAS_VERTICAL_SCROLL_BARS (f)
+    = (!FRAME_HAS_VERTICAL_SCROLL_BARS (f)
+       ? 0
+       : FRAME_SCROLL_BAR_PIXEL_WIDTH (f) > 0
        ? FRAME_SCROLL_BAR_PIXEL_WIDTH (f)
-       : 0);
+       : (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->display.x->font)));
   f->display.x->pixel_width = CHAR_TO_PIXEL_WIDTH (f, f->width);
   f->display.x->pixel_height = CHAR_TO_PIXEL_HEIGHT (f, f->height);