*** empty log message ***

1 files changed, 9 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4636c945877..0e3663d4614 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-20  Kim F. Storm  <storm@cua.dk>
+
+        * xfaces.c (best_matching_font): Fix crash in 2006-05-17 change.
+
 2006-05-20  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * macterm.c (convert_fn_keycode): Fix last change.
@@ -60,6 +64,11 @@
         * xdisp.c (display_tool_bar_line): Don't adjust tool-bar height by more than
         height of one frame default line.
 
+2006-05-17  Richard Stallman  <rms@gnu.org>
+
+        * xfaces.c (better_font_p): Any font beats no font.
+        (best_matching_font): Simplify based on above change.
+
 2006-05-16  Kim F. Storm  <storm@cua.dk>
 
         * xterm.c (handle_one_xevent): Check that f is not NULL before