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

[Andreas Schwab]

Index: emacs/src/emacs.c
diff -c emacs/src/emacs.c:1.344 emacs/src/emacs.c:1.345
*** emacs/src/emacs.c:1.344     Tue Nov  2 09:10:13 2004
--- emacs/src/emacs.c   Sun Nov  7 01:57:27 2004
***************
*** 1620,1635 ****
        keys_of_minibuf ();
        keys_of_window ();
      }
!       else
      {
!       /*
!         Initialization that must be done even if the global variable
!         initialized is non zero
!       */
  #ifdef HAVE_NTGUI
        globals_of_w32fns ();
        globals_of_w32menu ();
! #endif  /* end #ifdef HAVE_NTGUI */
      }
  
    if (!noninteractive)
--- 1620,1633 ----
        keys_of_minibuf ();
        keys_of_window ();
      }
!   else
      {
!       /* Initialization that must be done even if the global variable
!        initialized is non zero.  */
  #ifdef HAVE_NTGUI
        globals_of_w32fns ();
        globals_of_w32menu ();
! #endif  /* HAVE_NTGUI */
      }
  
    if (!noninteractive)
***************
*** 2279,2285 ****
      {
        *plocale = desired_locale;
        setlocale (category, (STRINGP (desired_locale)
!                           ? (char *)(SDATA (desired_locale))
                            : ""));
      }
  }
--- 2277,2283 ----
      {
        *plocale = desired_locale;
        setlocale (category, (STRINGP (desired_locale)
!                           ? (char *) SDATA (desired_locale)
                            : ""));
      }
  }