[Emacs-diffs] trunk r114303: Fix syms_of_(mac|ms)font calls.

[Jan D.]

------------------------------------------------------------
revno: 114303
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Mon 2013-09-16 17:55:02 +0200
message:
  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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/font.c                     font.c-20091113204419-o5vbwnq5f7feedwu-8540
  src/nsterm.m                   nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-16 11:23:03 +0000
+++ b/src/ChangeLog     2013-09-16 15:55:02 +0000
@@ -1,3 +1,9 @@
+2013-09-16  Jan Djärv  <address@hidden>
+
+       * 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  <address@hidden>
 
        * xterm.c (toolkit_scroll_bar_interaction): Use bool for boolean.

=== modified file 'src/font.c'
--- a/src/font.c        2013-09-15 19:43:32 +0000
+++ b/src/font.c        2013-09-16 15:55:02 +0000
@@ -5197,12 +5197,6 @@
 #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 */
 }
 

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2013-09-15 17:58:46 +0000
+++ b/src/nsterm.m      2013-09-16 15:55:02 +0000
@@ -7461,4 +7461,12 @@
 
   /* 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
+  
 }