Mercurial > emacs
changeset 108498:f01adbed6fd8
Merge from emacs-23
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 11 May 2010 17:02:32 -0400 |
| parents | aacdc5451940 (current diff) f35b8e7b8a1f (diff) |
| children | ffe7f17f895f |
| files | src/ChangeLog |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue May 11 22:42:21 2010 +0300 +++ b/src/ChangeLog Tue May 11 17:02:32 2010 -0400 @@ -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.
--- a/src/ftfont.c Tue May 11 22:42:21 2010 +0300 +++ b/src/ftfont.c Tue May 11 17:02:32 2010 -0400 @@ -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. */