Commit 6434e343 authored by Jan Djärv's avatar Jan Djärv
Browse files

Fix syms_of_(mac|ms)font calls.

* font.c (syms_of_font): Move call to syms_of_(ns|mac)font ...

* nsterm.m (syms_of_nsterm): ... to here.
parent 83a119f8
2013-09-16 Jan Djärv <jan.h.d@swipnet.se>
* font.c (syms_of_font): Move call to syms_of_(ns|mac)font ...
* nsterm.m (syms_of_nsterm): ... to here.
2013-09-16 Dmitry Antipov <dmantipov@yandex.ru>
* xterm.c (toolkit_scroll_bar_interaction): Use bool for boolean.
......
......@@ -5197,12 +5197,6 @@ EMACS_FONT_LOG is set. Otherwise, it is set to t. */);
#ifdef HAVE_NTGUI
syms_of_w32font ();
#endif /* HAVE_NTGUI */
#ifdef HAVE_NS
syms_of_nsfont ();
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
syms_of_macfont ();
#endif
#endif /* HAVE_NS */
#endif /* HAVE_WINDOW_SYSTEM */
}
......
......@@ -7461,4 +7461,12 @@ Nil means use fullscreen the old (< 10.7) way. The old way works better with
/* Tell Emacs about this window system. */
Fprovide (Qns, Qnil);
syms_of_nsfont ();
#ifdef NS_IMPL_COCOA
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
syms_of_macfont ();
#endif
#endif
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment