diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2019-06-19 18:07:00 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2019-06-19 18:07:00 +0900 |
| commit | 2419fa3937f07f8e2e4a79f77fe367a9979cb578 (patch) | |
| tree | 611706c80c2b4a6caae332e791e986b08f94e7cf | |
| parent | 50c5d5621cb5e6d7c86829ac4b776d81e47b2189 (diff) | |
| download | emacs-2419fa3937f07f8e2e4a79f77fe367a9979cb578.tar.gz | |
Fix oversights of "support X core font driver on cairo" change
* src/Makefile.in (FONT_OBJ): Fix comment for USE_CAIRO.
* src/xfns.c (x_create_tip_frame) [USE_CAIRO]: Register xfont_driver.
| -rw-r--r-- | src/Makefile.in | 2 | ||||
| -rw-r--r-- | src/xfns.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 0e3efb359b8..02a1a2c4cf9 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -297,7 +297,7 @@ W32_RES_LINK=@W32_RES_LINK@ ## Empty if !HAVE_X_WINDOWS ## xfont.o ftfont.o xftfont.o ftxfont.o if HAVE_XFT ## xfont.o ftfont.o ftxfont.o if HAVE_FREETYPE -## ftfont.o ftcrfont.o if USE_CAIRO +## xfont.o ftfont.o ftcrfont.o if USE_CAIRO ## else xfont.o ## if HAVE_HARFBUZZ, hbfont.o is added regardless of the rest FONT_OBJ=@FONT_OBJ@ diff --git a/src/xfns.c b/src/xfns.c index 5787abb5281..c9fe3e11f2d 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -6225,8 +6225,8 @@ x_create_tip_frame (struct x_display_info *dpyinfo, Lisp_Object parms) register_font_driver (&ftxfont_driver, f); #endif /* not HAVE_XFT */ #endif /* HAVE_FREETYPE */ - register_font_driver (&xfont_driver, f); #endif /* not USE_CAIRO */ + register_font_driver (&xfont_driver, f); image_cache_refcount = FRAME_IMAGE_CACHE (f) ? FRAME_IMAGE_CACHE (f)->refcount : 0; |