[Emacs-diffs] Changes to emacs/src/emacs.c

[YAMAMOTO Mitsuharu]

Index: emacs/src/emacs.c
diff -c emacs/src/emacs.c:1.358 emacs/src/emacs.c:1.359
*** emacs/src/emacs.c:1.358     Thu Mar  3 15:34:52 2005
--- emacs/src/emacs.c   Fri Mar  4 11:06:42 2005
***************
*** 1482,1488 ****
    init_ntproc ();     /* must precede init_editfns.  */
  #endif
  
! #ifdef HAVE_CARBON
    if (initialized)
      init_mac_osx_environment ();
  #endif
--- 1482,1488 ----
    init_ntproc ();     /* must precede init_editfns.  */
  #endif
  
! #if defined (MAC_OSX) && defined (HAVE_CARBON)
    if (initialized)
      init_mac_osx_environment ();
  #endif
***************
*** 1626,1637 ****
        syms_of_fontset ();
  #endif /* HAVE_NTGUI */
  
! #ifdef HAVE_CARBON
        syms_of_macterm ();
        syms_of_macfns ();
        syms_of_macmenu ();
        syms_of_fontset ();
! #endif /* HAVE_CARBON */
  
  #ifdef SYMS_SYSTEM
        SYMS_SYSTEM;
--- 1626,1637 ----
        syms_of_fontset ();
  #endif /* HAVE_NTGUI */
  
! #if defined (MAC_OSX) && defined (HAVE_CARBON)
        syms_of_macterm ();
        syms_of_macfns ();
        syms_of_macmenu ();
        syms_of_fontset ();
! #endif /* MAC_OSX && HAVE_CARBON */
  
  #ifdef SYMS_SYSTEM
        SYMS_SYSTEM;