Commit 587e4b13 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

Merge from emacs-23

parents 841c4085 dc9ed794
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.
......
......@@ -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. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment