[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 2419fa3: Fix oversights of "support X core font dri
From: |
YAMAMOTO Mitsuharu |
Subject: |
[Emacs-diffs] master 2419fa3: Fix oversights of "support X core font driver on cairo" change |
Date: |
Wed, 19 Jun 2019 05:08:15 -0400 (EDT) |
branch: master
commit 2419fa3937f07f8e2e4a79f77fe367a9979cb578
Author: YAMAMOTO Mitsuharu <address@hidden>
Commit: YAMAMOTO Mitsuharu <address@hidden>
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.
---
src/Makefile.in | 2 +-
src/xfns.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Makefile.in b/src/Makefile.in
index 0e3efb3..02a1a2c 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 5787abb..c9fe3e1 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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 2419fa3: Fix oversights of "support X core font driver on cairo" change,
YAMAMOTO Mitsuharu <=