diff options
| author | Joakim Verona <joakim@verona.se> | 2016-01-15 20:06:45 +0100 |
|---|---|---|
| committer | Joakim Verona <joakim@verona.se> | 2016-01-15 20:06:45 +0100 |
| commit | 4b73dac2885aa7eb23b66c299065e19bd118a4fb (patch) | |
| tree | 18452b36b890faf52d40f555ebe4dc3c6e020bc6 /src/ftfont.c | |
| parent | 0d824cc5e79e7d29a01929a51dfd673a117c77e8 (diff) | |
| parent | 984a14904658da42ca9dea50a811a901ddc56e60 (diff) | |
| download | emacs-xwidget_mvp.tar.gz | |
merge masterxwidget_mvp
Diffstat (limited to 'src/ftfont.c')
| -rw-r--r-- | src/ftfont.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index 575bf53701c..505d508d2e0 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -1,5 +1,5 @@ /* ftfont.c -- FreeType font driver. - Copyright (C) 2006-2015 Free Software Foundation, Inc. + Copyright (C) 2006-2016 Free Software Foundation, Inc. Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H13PRO009 @@ -2590,7 +2590,7 @@ ftfont_shape_by_flt (Lisp_Object lgstring, struct font *font, flt_font_ft.otf = otf; flt_font_ft.matrix = matrix->xx != 0 ? matrix : 0; - if (1 < len || ! otf) + if (1 < len) { /* A little bit ad hoc. Perhaps, shaper must get script and language information, and select a proper flt for them @@ -2598,9 +2598,11 @@ ftfont_shape_by_flt (Lisp_Object lgstring, struct font *font, int c1 = LGLYPH_CHAR (LGSTRING_GLYPH (lgstring, 1)); if (CHAR_HAS_CATEGORY (c1, '^')) flt = mflt_get (msymbol ("combining")); - else if (! otf) - flt = mflt_find (LGLYPH_CHAR (LGSTRING_GLYPH (lgstring, 0)), - &flt_font_ft.flt_font); + } + if (! flt && ! otf) + { + flt = mflt_find (LGLYPH_CHAR (LGSTRING_GLYPH (lgstring, 0)), + &flt_font_ft.flt_font); if (! flt) return make_number (0); } |