diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-12-15 15:19:25 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-12-15 15:19:25 -0800 |
| commit | 2e2fb82e5f187614bd6997a3ace72d07bba4f1ab (patch) | |
| tree | f54dc1ac78b7fd10e23e37ddee2337a83463b3e0 /src/ftfont.c | |
| parent | 498b6cb0bf882367fe73f5efee5154348c209aea (diff) | |
| parent | fa953b58afd39d396dab4d76a6ff0b8ba4040eb8 (diff) | |
| download | emacs-2e2fb82e5f187614bd6997a3ace72d07bba4f1ab.tar.gz | |
Merge from origin/emacs-26
fa953b5 (origin/emacs-26) Fix an epg test for recent GnuPG versions (...
3015636 Document font structure layout constraints
f14d574 Document font structure layout constraints
f519aa1 Fix display of line numbers in empty lines beyond EOB
24b5026 Fix redisplay when a window's scroll bar or fringes are changed
5d1b158 Tiny markup fix in Elisp manual
Diffstat (limited to 'src/ftfont.c')
| -rw-r--r-- | src/ftfont.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index e83eff3ad08..44e0e626ee6 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -56,8 +56,9 @@ struct ftfont_info { struct font font; #ifdef HAVE_LIBOTF - /* The following four members must be here in this order to be - compatible with struct xftfont_info (in xftfont.c). */ + /* The following members up to and including 'matrix' must be here in + this order to be compatible with struct xftfont_info (in + xftfont.c). */ bool maybe_otf; /* Flag to tell if this may be OTF or not. */ OTF *otf; #endif /* HAVE_LIBOTF */ |