# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1156164680 0
# Node ID bad57814fca37c9bd97098933eebb4bbe016149c
# Parent  697dcc1df88d6535bce218c3699c3ae7e2d21f82
*** empty log message ***

diff -r 697dcc1df88d -r bad57814fca3 lisp/ChangeLog.unicode
--- a/lisp/ChangeLog.unicode	Mon Aug 21 12:50:21 2006 +0000
+++ b/lisp/ChangeLog.unicode	Mon Aug 21 12:51:20 2006 +0000
@@ -1,3 +1,14 @@
+2006-08-21  Kenichi Handa  <handa@m17n.org>
+
+	* international/uni-bidi.el, international/uni-category.el,
+	international/uni-combining.el, international/uni-comment.el,
+	international/uni-decimal.el, international/uni-decomposition.el,
+	international/uni-digit.el, international/uni-lowercase.el,
+	international/uni-mirrored.el, international/uni-name.el,
+	international/uni-numeric.el, international/uni-old-name.el,
+	international/uni-titlecase.el, international/uni-uppercase.el:
+	Re-generated.
+
 2006-08-04  Kenichi Handa  <handa@m17n.org>
 
 	* international/mule-cmds.el (select-safe-coding-system): Fix
diff -r 697dcc1df88d -r bad57814fca3 src/ChangeLog.unicode
--- a/src/ChangeLog.unicode	Mon Aug 21 12:50:21 2006 +0000
+++ b/src/ChangeLog.unicode	Mon Aug 21 12:51:20 2006 +0000
@@ -1,3 +1,20 @@
+2006-08-21  Kenichi Handa  <handa@m17n.org>
+
+	* font.c (font_matching_entity): Dolete unused local var.
+
+	* xftfont.c (xftfont_open): Call XftDefaultSubstitute before
+	opening a font.
+
+	* fileio.c (Finsert_file_contents): On recovering a file, assume
+	Unix-like eol.
+	(choose_write_coding_system): On auto-saving a file, force
+	Unix-like eol.
+
+	* coding.c (setup_coding_system): Fix setting of
+	coding->common_flags based on eol_type.
+	(coding_inherit_eol_type): If PARENT is not nil, be sure to
+	inherit from it.
+
 2006-08-04  Kenichi Handa  <handa@m17n.org>
 
 	* alloc.c (NSTATICS): Increased to 0x600.
diff -r 697dcc1df88d -r bad57814fca3 src/font.c
--- a/src/font.c	Mon Aug 21 12:50:21 2006 +0000
+++ b/src/font.c	Mon Aug 21 12:51:20 2006 +0000
@@ -2393,7 +2393,7 @@
 	&& (NILP (ftype) || EQ (driver_list->driver->type, ftype)))
       {
 	Lisp_Object cache = driver_list->driver->get_cache (frame);
-	Lisp_Object val, key;
+	Lisp_Object key;
 
 	xassert (CONSP (cache));
 	ASET (spec, FONT_TYPE_INDEX, driver_list->driver->type);