1 files changed, 10 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 43fdaaf3276..157ff6db673 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,15 @@
 2010-04-10  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-        * xfns.c (Fx_show_tip): Undo last change.
+        * dispextern.h (TRY_WINDOW_CHECK_MARGINS)
+        (TRY_WINDOW_IGNORE_FONTS_CHANGE): New defines.
+
+        * xdisp.c (try_window): Change arg from CHECK_MARGINS to FLAGS.
+        Don't abort with fonts change if TRY_WINDOW_IGNORE_FONTS_CHANGE is
+        set in FLAGS.  Callers with non-zero CHECK_MARGINS changed to use
+        TRY_WINDOW_CHECK_MARGINS.
+
+        * xfns.c (Fx_show_tip): Undo last change.  Call try_window with
+        TRY_WINDOW_IGNORE_FONTS_CHANGE (Bug#2423).
 
 2010-04-09  Jan Djärv  <jan.h.d@swipnet.se>