*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b97127a513b18c58a854d375388ecf1c4e8f7506..6f444e953592dba116e9666eafbddca9cdabf747 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2006-05-21  Kim F. Storm  <storm@cua.dk>
 
+       * emulation/cua-base.el: Mention customizing cua-mode as alternative
+       way to enable built-in cua-mode if user loads older CUA-mode package.
+
        * ido.el (ido-read-file-name): Bind ido-show-dot-for-dired to nil
        if default-filename is specified.
 

diff --git a/src/ChangeLog b/src/ChangeLog
index 4636c945877d5a3d8463ce92f347495b7d6160d4..0e3663d4614c26646a68f575871475793c8f76ef 100644 (file)
--- 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