2013-09-15 Jan Djärv <jan.h.d@swipnet.se>
+ * nsfns.m (Fx_create_frame): Fix font driver registration for
+ GNUStep.
+
+ * font.c (syms_of_font): Check MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
+ for syms_of_macfont.
+
* nsterm.m: Include macfont.h.
(ns_tmp_flags, ns_tmp_font): Remove.
(ns_compute_glyph_string_overhangs): Check for driver Qns.
block_input ();
-#ifdef NS_IMPL_GNUSTEP || \
- MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
- register_font_driver (&nsfont_driver, f);
-#else
+#ifdef NS_IMPL_COCOA
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
if (CTGetCoreTextVersion != NULL
&& CTGetCoreTextVersion () >= kCTVersionNumber10_5)
mac_register_font_driver (f);
- register_font_driver (&nsfont_driver, f);
#endif
+#endif
+ register_font_driver (&nsfont_driver, f);
x_default_parameter (f, parms, Qfont_backend, Qnil,
"fontBackend", "FontBackend", RES_TYPE_STRING);