[Emacs-diffs] /srv/bzr/emacs/trunk r100233: Merge from emacs-23

[Stefan Monnier]

------------------------------------------------------------
revno: 100233 [merge]
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2010-05-11 17:02:32 -0400
message:
  Merge from emacs-23
modified:
  src/ChangeLog
  src/ftfont.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-11 02:51:08 +0000
+++ b/src/ChangeLog     2010-05-11 21:02:32 +0000
@@ -1,3 +1,8 @@
+2010-05-11  Karel Klic  <address@hidden>
+
+       * ftfont.c: Fix incorrect parentheses of #if condition for
+       definining M17N_FLT_USE_NEW_FEATURE.
+
 2010-05-11  Glenn Morris  <address@hidden>
 
        * Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.

=== modified file 'src/ftfont.c'
--- a/src/ftfont.c      2010-04-23 12:29:11 +0000
+++ b/src/ftfont.c      2010-05-11 11:15:29 +0000
@@ -1578,8 +1578,8 @@
 
 #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.  */