diff options
| author | YAMAMOTO Mitsuharu | 2019-06-19 18:07:00 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2019-06-19 18:07:00 +0900 |
| commit | 2419fa3937f07f8e2e4a79f77fe367a9979cb578 (patch) | |
| tree | 611706c80c2b4a6caae332e791e986b08f94e7cf /src/Makefile.in | |
| parent | 50c5d5621cb5e6d7c86829ac4b776d81e47b2189 (diff) | |
| download | emacs-2419fa3937f07f8e2e4a79f77fe367a9979cb578.tar.gz emacs-2419fa3937f07f8e2e4a79f77fe367a9979cb578.zip | |
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.
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 2 |
1 files changed, 1 insertions, 1 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@ | |||
| 297 | ## Empty if !HAVE_X_WINDOWS | 297 | ## Empty if !HAVE_X_WINDOWS |
| 298 | ## xfont.o ftfont.o xftfont.o ftxfont.o if HAVE_XFT | 298 | ## xfont.o ftfont.o xftfont.o ftxfont.o if HAVE_XFT |
| 299 | ## xfont.o ftfont.o ftxfont.o if HAVE_FREETYPE | 299 | ## xfont.o ftfont.o ftxfont.o if HAVE_FREETYPE |
| 300 | ## ftfont.o ftcrfont.o if USE_CAIRO | 300 | ## xfont.o ftfont.o ftcrfont.o if USE_CAIRO |
| 301 | ## else xfont.o | 301 | ## else xfont.o |
| 302 | ## if HAVE_HARFBUZZ, hbfont.o is added regardless of the rest | 302 | ## if HAVE_HARFBUZZ, hbfont.o is added regardless of the rest |
| 303 | FONT_OBJ=@FONT_OBJ@ | 303 | FONT_OBJ=@FONT_OBJ@ |