*** empty log message ***

diff --git a/lisp/ChangeLog.unicode b/lisp/ChangeLog.unicode
index 2e3dc7e..93189f4 100644 (file)
--- a/lisp/ChangeLog.unicode
+++ b/lisp/ChangeLog.unicode
@@ -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 --git a/src/ChangeLog.unicode b/src/ChangeLog.unicode
index c7cfafd..3b7602b 100644 (file)
--- a/src/ChangeLog.unicode
+++ b/src/ChangeLog.unicode
@@ -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 --git a/src/font.c b/src/font.c
index b5d814b..63b762e 100644 (file)
--- a/src/font.c
+++ b/src/font.c
@@ -2393,7 +2393,7 @@ font_matching_entity (frame, spec)
        && (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);