procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from emacs-23

Browse source
This commit is contained in:
Stefan Monnier 2010-05-11 17:02:32 -04:00
commit 587e4b1379
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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.

4
src/ftfont.c
View file

@ -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. */