From: Kim F. Storm <storm@cua.dk>
Date: Sat, 20 May 2006 22:37:32 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~2441
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5748161eab49a31937c184abbf601ee8de750fe4;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b97127a513b..6f444e95359 100644
--- 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 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