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.

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;