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 --git a/src/ChangeLog b/src/ChangeLog
index 6ca09f99fe70a204fb59490cc37a96eb8ae141b8..5119a048c2ff20c4daa496a4bc564b5b56e5085d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -8,6 +8,8 @@
        Remove #ifdef USE_GTK around finish = X_EVENT_DROP.
        Remove #ifdef USE_MOTIF code that did SET_SAVED_BUTTON_EVENT for
        ButtonRelease.
+       (x_set_window_size_1): scroll_bar_actual_width is always
+       SCROLL_BAR_COLS * COLUMN_WIDTH for the purpose of frame sizing.
 
        * xdisp.c (pending_menu_activation): Remove extern declaration.
        (prepare_menu_bars): Remove setting of pending_menu_activation.

diff --git a/src/xterm.c b/src/xterm.c
index e66845df26caba1884c2e197429d1f35ea6218b7..1427797f8d595784d8919dff11c0b77418c19444 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8606,9 +8606,7 @@ x_set_window_size_1 (struct frame *f, int change_gravity, int cols, int rows)
   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);