[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/raeburn-startup 272c874 23/43: Fix startup on MS-W
From: |
Ken Raeburn |
Subject: |
[Emacs-diffs] scratch/raeburn-startup 272c874 23/43: Fix startup on MS-Windows |
Date: |
Mon, 31 Jul 2017 02:11:02 -0400 (EDT) |
branch: scratch/raeburn-startup
commit 272c87483efb351b835bc097bd2e69797ba69c8c
Author: Eli Zaretskii <address@hidden>
Commit: Ken Raeburn <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 b7c0b47..4b64a69 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 ();
- [Emacs-diffs] scratch/raeburn-startup f6793d2 41/43: Don't use byte-compile-dynamic for stuff we're going to load., (continued)
- [Emacs-diffs] scratch/raeburn-startup f6793d2 41/43: Don't use byte-compile-dynamic for stuff we're going to load., Ken Raeburn, 2017/07/31
- [Emacs-diffs] scratch/raeburn-startup 9664101 16/43: Load dumped.elc quietly., Ken Raeburn, 2017/07/31
- [Emacs-diffs] scratch/raeburn-startup cc22b26 19/43: Don't save internal--text-quoting-flag., Ken Raeburn, 2017/07/31
- [Emacs-diffs] scratch/raeburn-startup 3da90ae 32/43: Make watchers dumpable., Ken Raeburn, 2017/07/31
- [Emacs-diffs] scratch/raeburn-startup 363abae 30/43: Support dumping variable aliases., Ken Raeburn, 2017/07/31
- [Emacs-diffs] scratch/raeburn-startup 291e585 24/43: Update load-path and purify-flag even if not bootstrapping., Ken Raeburn, 2017/07/31
- [Emacs-diffs] scratch/raeburn-startup 2c96099 27/43: Don't dump artifacts of the dump process., Ken Raeburn, 2017/07/31
- [Emacs-diffs] scratch/raeburn-startup bd8bcb3 29/43: Load uniquify after dump/reload., Ken Raeburn, 2017/07/31
- [Emacs-diffs] scratch/raeburn-startup d987a68 39/43: Don't show the build directory in load-history., Ken Raeburn, 2017/07/31
- [Emacs-diffs] scratch/raeburn-startup de45051 37/43: Fix use of "-l" on command line after installation., Ken Raeburn, 2017/07/31
- [Emacs-diffs] scratch/raeburn-startup 272c874 23/43: Fix startup on MS-Windows,
Ken Raeburn <=
- [Emacs-diffs] scratch/raeburn-startup d95042a 35/43: ; Add comment regarding silent loading of dumped.elc., Ken Raeburn, 2017/07/31
- [Emacs-diffs] scratch/raeburn-startup 5d4b7f9 26/43: Dump and restore empty abbrev tables., Ken Raeburn, 2017/07/31
- [Emacs-diffs] scratch/raeburn-startup a0ac557 28/43: Clear out doc strings matching DOC file before dumping., Ken Raeburn, 2017/07/31
- [Emacs-diffs] scratch/raeburn-startup 7764bd73 36/43: * lisp/loadup.el: Load uniquify quietly. Put fewer newlines in dump file., Ken Raeburn, 2017/07/31
- [Emacs-diffs] scratch/raeburn-startup 6faa843 20/43: Load documentation at startup., Ken Raeburn, 2017/07/31
- [Emacs-diffs] scratch/raeburn-startup 43dcdd3 25/43: Load cl-macs, needed for cl-labels., Ken Raeburn, 2017/07/31
- [Emacs-diffs] scratch/raeburn-startup 761346d 34/43: Use CANNOT_DUMP mode., Ken Raeburn, 2017/07/31
- [Emacs-diffs] scratch/raeburn-startup dbdfea8 33/43: Don't check for dump-emacs being bound., Ken Raeburn, 2017/07/31
- [Emacs-diffs] scratch/raeburn-startup 6794f2e 40/43: Make more preloaded files visible to make-docfile., Ken Raeburn, 2017/07/31
- [Emacs-diffs] scratch/raeburn-startup cd0966b 42/43: ; admin/notes/big-elc: Notes on this experimental branch., Ken Raeburn, 2017/07/31