diff options
| author | Vibhav Pant | 2020-08-21 14:04:35 +0530 |
|---|---|---|
| committer | Vibhav Pant | 2020-08-21 14:04:35 +0530 |
| commit | f0f8d7b82492e741950c363a03b886965c91b1b0 (patch) | |
| tree | 19b716830b1ebabc0d7d75949c4e6800c0f104ad /src/ftfont.c | |
| parent | 9e64a087c4d167e7ec1c4e22bea3e6af53b563de (diff) | |
| parent | c818c29771d3cb51875643b2f6c894073e429dd2 (diff) | |
| download | emacs-feature/native-comp-macos-fixes.tar.gz emacs-feature/native-comp-macos-fixes.zip | |
Merge branch 'feature/native-comp' into feature/native-comp-macos-fixesfeature/native-comp-macos-fixes
Diffstat (limited to 'src/ftfont.c')
| -rw-r--r-- | src/ftfont.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index 696f5e65341..a904007a329 100644 --- a/src/ftfont.c +++ b/src/ftfont.c | |||
| @@ -2826,14 +2826,10 @@ ftfont_shape_by_flt (Lisp_Object lgstring, struct font *font, | |||
| 2826 | LGLYPH_SET_ASCENT (lglyph, g->g.ascent >> 6); | 2826 | LGLYPH_SET_ASCENT (lglyph, g->g.ascent >> 6); |
| 2827 | LGLYPH_SET_DESCENT (lglyph, g->g.descent >> 6); | 2827 | LGLYPH_SET_DESCENT (lglyph, g->g.descent >> 6); |
| 2828 | if (g->g.adjusted) | 2828 | if (g->g.adjusted) |
| 2829 | { | 2829 | LGLYPH_SET_ADJUSTMENT (lglyph, CALLN (Fvector, |
| 2830 | Lisp_Object vec = make_uninit_vector (3); | 2830 | make_fixnum (g->g.xoff >> 6), |
| 2831 | 2831 | make_fixnum (g->g.yoff >> 6), | |
| 2832 | ASET (vec, 0, make_fixnum (g->g.xoff >> 6)); | 2832 | make_fixnum (g->g.xadv >> 6))); |
| 2833 | ASET (vec, 1, make_fixnum (g->g.yoff >> 6)); | ||
| 2834 | ASET (vec, 2, make_fixnum (g->g.xadv >> 6)); | ||
| 2835 | LGLYPH_SET_ADJUSTMENT (lglyph, vec); | ||
| 2836 | } | ||
| 2837 | } | 2833 | } |
| 2838 | return make_fixnum (i); | 2834 | return make_fixnum (i); |
| 2839 | } | 2835 | } |