diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2013-09-16 17:55:02 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2013-09-16 17:55:02 +0200 |
| commit | 6434e34375dde73a575c5f88970b2793a7cb7fe6 (patch) | |
| tree | 99b451ab7428f4969d5fa51a503a960c947c51c5 | |
| parent | 83a119f8d892a790b25bd0d856df82fb25b0ba72 (diff) | |
| download | emacs-6434e34375dde73a575c5f88970b2793a7cb7fe6.tar.gz | |
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.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/font.c | 6 | ||||
| -rw-r--r-- | src/nsterm.m | 8 |
3 files changed, 14 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d53f1414917..8b9c1ca904d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +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. diff --git a/src/font.c b/src/font.c index cc832f9a88a..68db9f2ef2d 100644 --- a/src/font.c +++ b/src/font.c @@ -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 */ } diff --git a/src/nsterm.m b/src/nsterm.m index 2fc8a09c80f..6c5f5f54cb9 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -7461,4 +7461,12 @@ baseline level. The default value is nil. */); /* 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 + } |