# HG changeset patch
# User Jan D <jan.h.d@swipnet.se>
# Date 1279120259 -7200
# Node ID 2e27c5066b94d11ffd434c804935892d909ff11a
# Parent  3bc7daa51aa988507972ac1a22578d96a7d97a3f
Fix frame size when scroll bar width not an integral of column width.

xterm.c (x_set_window_size_1): scroll_bar_actual_width is always
SCROLL_BAR_COLS * COLUMN_WIDTH for the purpose of frame sizing.

diff -r 3bc7daa51aa9 -r 2e27c5066b94 src/xterm.c
--- a/src/xterm.c	Wed Jul 14 17:06:33 2010 +0200
+++ b/src/xterm.c	Wed Jul 14 17:10:59 2010 +0200
@@ -8606,9 +8606,7 @@
   f->scroll_bar_actual_width
     = (!FRAME_HAS_VERTICAL_SCROLL_BARS (f)
        ? 0
-       : FRAME_CONFIG_SCROLL_BAR_WIDTH (f) > 0
-       ? FRAME_CONFIG_SCROLL_BAR_WIDTH (f)
-       : (FRAME_CONFIG_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f)));
+       : FRAME_CONFIG_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f));
 
   compute_fringe_widths (f, 0);