1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-10 05:30:45 -08:00

*** empty log message ***

This commit is contained in:
Kenichi Handa 2007-12-03 01:42:57 +00:00
parent 0d674a059d
commit 794eba0f36
2 changed files with 7 additions and 2 deletions

View file

@ -1,3 +1,8 @@
2007-12-03 Kenichi Handa <handa@ni.aist.go.jp>
* ftfont.c (ftfont_open): Set members maybe_otf and otf of
ftfont_info only when HAVE_LIBOTF is defined.
2007-12-02 Andreas Schwab <schwab@suse.de>
* xdisp.c (back_to_previous_visible_line_start): Fix type of beg

View file

@ -54,7 +54,7 @@ struct xftfont_info
#ifdef HAVE_LIBOTF
int maybe_otf; /* Flag to tell if this may be OTF or not. */
OTF *otf;
#endif
#endif /* HAVE_LIBOTF */
};
/* Structure pointed by (struct face *)->extra */
@ -273,7 +273,7 @@ xftfont_open (f, entity, pixel_size)
#ifdef HAVE_LIBOTF
xftfont_info->maybe_otf = xftfont_info->ft_face->face_flags & FT_FACE_FLAG_SFNT;
xftfont_info->otf = NULL;
#endif
#endif /* HAVE_LIBOTF */
font = (struct font *) xftfont_info;
font->format = ftfont_font_format (xftfont->pattern);