Merge from emacs-23

diff --git a/src/ChangeLog b/src/ChangeLog
index 8bac657..35b5153 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-11  Karel Klic  <kklic@redhat.com>
+
+       * ftfont.c: Fix incorrect parentheses of #if condition for
+       definining M17N_FLT_USE_NEW_FEATURE.
+
 2010-05-11  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.

diff --git a/src/ftfont.c b/src/ftfont.c
index 6956c13..9699dc5 100644 (file)
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -1578,8 +1578,8 @@ ftfont_otf_capability (font)
 
 #ifdef HAVE_M17N_FLT
 
-#if ((LIBOTF_MAJOR_VERSION > 1) || (LIBOTF_RELEASE_NUMBER >= 10) \
-     && (M17NLIB_MAJOR_VERSION > 1) || (M17NLIB_MINOR_VERSION >= 6))
+#if (((LIBOTF_MAJOR_VERSION > 1) || (LIBOTF_RELEASE_NUMBER >= 10))     \
+     && ((M17NLIB_MAJOR_VERSION > 1) || (M17NLIB_MINOR_VERSION >= 6)))
 /* We can use the new feature of libotf and m17n-flt to handle the
    character encoding scheme introduced in Unicode 5.1 and 5.2 for
    some Agian scripts.  */