From: Miles Bader <miles@gnu.org>
Date: Tue, 1 May 2007 23:27:26 +0000 (+0000)
Subject: Merge from emacs--unicode--0
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f4ab1288418547b8190f0e99eadfcb3f524d6c8b;p=emacs.git

Merge from emacs--unicode--0

Patches applied:

 * emacs--devo--0  (patch 698-725)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Merge from emacs--rel--22
   - Merge from emacs--rel--22: lisp/dired-x.el: Revert 2007-04-06 change.

 * emacs--rel--22  (base, patch 1-5)

   - tag of emacs@sv.gnu.org/emacs--devo--0--patch-709
   - Sync to CVS tag EMACS_22_BRANCHPOINT
   - Sync to CVS branch EMACS_22_BASE
   - Update from CVS

 * emacs--unicode--0  (patch 191-202)

   - Change default value of `enable_font_backend' to 1
   - Update from CVS
   - Move src/ChangeLog entry to src/ChangeLog.unicode
   - Merge from emacs--devo--0

 * gnus--rel--5.10  (patch 216-217)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode-xft--0--patch-61
---

f4ab1288418547b8190f0e99eadfcb3f524d6c8b
diff --cc ChangeLog.unicode
index f9967b482cc,2ff9bf61158..0dd31042fd9
--- a/ChangeLog.unicode
+++ b/ChangeLog.unicode
@@@ -1,7 -1,10 +1,14 @@@
+ 2007-05-01  Kenichi Handa  <handa@m17n.org>
+ 
+ 	* configure: Re-generated.
+ 
+ 	* configure.in: Don't define HAVE_LIBOTF if OTF_get_features is
+ 	not available.
+ 
 +2006-08-28   Jan Djärv  <jan.h.d@swipnet.se>
 +
 +	* configure.in: Don't use FONT_BACKEND if no x11
 +
  2006-06-06  Kenichi Handa  <handa@m17n.org>
  
  	* configure.in: New args --enable-font-backend, --with-xft,