(x_new_font): Update f->scroll_bar_actual_width.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0915837..e8df7f7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * font.c (font_open_entity): Don't use ASET if font_object is Qnil.
+
+       * xterm.c (x_new_font): Update f->scroll_bar_actual_width.
+
 2009-11-24  Glenn Morris  <rgm@gnu.org>
 
        * frame.c (focus-follows-mouse): Mention mouse-autoselect-window.

diff --git a/src/xterm.c b/src/xterm.c
index aefa9d7..94093bd 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8070,6 +8070,10 @@ x_new_font (f, font_object, fontset)
           pixelh -= FRAME_MENUBAR_HEIGHT (f);
 #endif
           rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixelh);
+         /* Update f->scroll_bar_actual_width because it is used in
+            FRAME_PIXEL_WIDTH_TO_TEXT_COLS.  */
+         f->scroll_bar_actual_width
+           = FRAME_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f);
           cols = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, FRAME_PIXEL_WIDTH (f));
           
           change_frame_size (f, rows, cols, 0, 1, 0);