2 files changed, 13 insertions, 0 deletions

diff --git a/README.unicode b/README.unicode
index 123fdae35dc..828ac7b5e97 100644
--- a/README.unicode
+++ b/README.unicode
@@ -141,6 +141,14 @@ to the new codes, and the new codes are used only when you configure
 Emacs with the argument "--enable-font-backend" and run Emacs with the
 same argument.
 
+Which font backends to use can be specified by X resource
+"FontBackend".  For instance, if you want to use Xft fonts only,
+
+Emacs.FontBackend: xft
+
+will work.  If this resource is not set, Emacs tries to use all font
+backends available on your graphic device.
+
 The configure script, if invoked with "--enable-font-backend", checks
 existing of libraries freetype and fontconfig.  If they are both
 available, macro "USE_FONT_BACKEND" is defined in src/config.h.  In
diff --git a/src/ChangeLog.unicode b/src/ChangeLog.unicode
index d3e18b5a675..3c93885e058 100644
--- a/src/ChangeLog.unicode
+++ b/src/ChangeLog.unicode
@@ -1,3 +1,8 @@
+2006-10-04  Kenichi Handa  <handa@m17n.org>
+
+        * regex.c (analyse_first): Cancel the change for synching with
+        HEAD.
+
 2006-08-28  Kenichi Handa  <handa@m17n.org>
 
         * coding.c (detect_coding_system): Fix for handling off