[Emacs-diffs] Changes to emacs/src/ChangeLog

[Kim F. Storm]

Index: emacs/src/ChangeLog
diff -u emacs/src/ChangeLog:1.5078 emacs/src/ChangeLog:1.5079
--- emacs/src/ChangeLog:1.5078  Sat May 20 07:15:33 2006
+++ emacs/src/ChangeLog Sat May 20 22:00:32 2006
@@ -1,3 +1,7 @@
+2006-05-20  Kim F. Storm  <address@hidden>
+
+       * xfaces.c (best_matching_font): Fix crash in 2006-05-17 change.
+
 2006-05-20  YAMAMOTO Mitsuharu  <address@hidden>
 
        * 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  <address@hidden>
+
+       * xfaces.c (better_font_p): Any font beats no font.
+       (best_matching_font): Simplify based on above change.
+
 2006-05-16  Kim F. Storm  <address@hidden>
 
        * xterm.c (handle_one_xevent): Check that f is not NULL before