diff options
| author | Jan D <jan.h.d@swipnet.se> | 2010-07-14 17:10:59 +0200 |
|---|---|---|
| committer | Jan D <jan.h.d@swipnet.se> | 2010-07-14 17:10:59 +0200 |
| commit | 6b2c4bd94eafbfe2417cf92a7a5702d3b70b454b (patch) | |
| tree | 1962ca92e987c7c00f11c551db578d4d43666885 | |
| parent | cf28cebc2e93dbd2cd0e6eb2f1a9543a015a1235 (diff) | |
| download | emacs-6b2c4bd94eafbfe2417cf92a7a5702d3b70b454b.tar.gz emacs-6b2c4bd94eafbfe2417cf92a7a5702d3b70b454b.tar.bz2 emacs-6b2c4bd94eafbfe2417cf92a7a5702d3b70b454b.zip | |
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.
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xterm.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6ca09f99fe7..5119a048c2f 100644 --- 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 e66845df26c..1427797f8d5 100644 --- 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); |