# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1259051876 0
# Node ID eae8732dcc163ade1710275e698072a50c6698ac
# Parent  63bf64653ed3d82a0af5b590576a59b2053468e7
*** empty log message ***

diff -r 63bf64653ed3 -r eae8732dcc16 src/ChangeLog
--- a/src/ChangeLog	Tue Nov 24 08:37:40 2009 +0000
+++ b/src/ChangeLog	Tue Nov 24 08:37:56 2009 +0000
@@ -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.