emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] scratch/raeburn-startup 6d75508: Fix startup on MS-Windows


From: Eli Zaretskii
Subject: [Emacs-diffs] scratch/raeburn-startup 6d75508: Fix startup on MS-Windows
Date: Sat, 25 Feb 2017 10:13:11 -0500 (EST)

branch: scratch/raeburn-startup
commit 6d755087d39ec9fc11392f7d9df79b4353121d71
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Fix startup on MS-Windows
    
    * emacs.c (main) [HAVE_NTGUI]: Call globals_of_w32* functions
    unconditionally.
---
 src/emacs.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/emacs.c b/src/emacs.c
index 51965b2..19be585 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1591,20 +1591,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 ();
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]