diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2009-11-24 08:37:56 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2009-11-24 08:37:56 +0000 |
| commit | e8e14166989dc9034e2d34c2070803b8a6136763 (patch) | |
| tree | c318e1be1d9cd2f1b9960cfb30c5740c8899df88 | |
| parent | 66f5ced096ac1bff2f54f2a653f1a3e12d8c8218 (diff) | |
| download | emacs-e8e14166989dc9034e2d34c2070803b8a6136763.tar.gz | |
(x_new_font): Update f->scroll_bar_actual_width.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/xterm.c | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 09158373226..e8df7f71cca 100644 --- 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 aefa9d7217b..94093bd3848 100644 --- 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); |