From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 25 Feb 2017 15:12:14 +0000 (+0200)
Subject: Fix startup on MS-Windows
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=272c87483efb351b835bc097bd2e69797ba69c8c;p=emacs.git

Fix startup on MS-Windows

* emacs.c (main) [HAVE_NTGUI]: Call globals_of_w32* functions
unconditionally.
---

diff --git a/src/emacs.c b/src/emacs.c
index b7c0b47cb29..4b64a69c588 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1610,20 +1610,17 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
       keys_of_keymap ();
       keys_of_window ();
     }
-  else
-    {
-      /* Initialization that must be done even if the global variable
-	 initialized is non zero.  */
+  /* Initialization that must be done even if the global variable
+     initialized is non zero.  */
 #ifdef HAVE_NTGUI
-      globals_of_w32font ();
-      globals_of_w32fns ();
-      globals_of_w32menu ();
+  globals_of_w32font ();
+  globals_of_w32fns ();
+  globals_of_w32menu ();
 #endif  /* HAVE_NTGUI */
 
 #if defined WINDOWSNT || defined HAVE_NTGUI
-      globals_of_w32select ();
+  globals_of_w32select ();
 #endif
-    }
 
   init_charset ();