From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 7 Nov 2011 16:42:34 +0000 (+0200)
Subject: Allow to run temacs.exe on MS-Windows in GUI mode.
X-Git-Tag: emacs-pretest-24.0.92~121^2~32
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c7aa8333556ef20b5e49143271e0331988c15f01;p=emacs.git

Allow to run temacs.exe on MS-Windows in GUI mode.

 src/w32.c (check_windows_init_file): Don't look for term/w32-win.el
 if Vpurify_flag is non-nil.  Fixes a crash when running w32 build
 of temacs in GUI mode.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 5b406a7bc46..3594a83eb5f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-07  Eli Zaretskii  <eliz@gnu.org>
+
+	* w32.c (check_windows_init_file): Don't look for term/w32-win.el
+	if Vpurify_flag is non-nil.  Fixes a crash when running w32 build
+	of temacs in GUI mode.
+
 2011-11-07  Martin Rudalics  <rudalics@gmx.at>
 
 	* window.h: Declare delete_all_child_windows instead of
diff --git a/src/w32.c b/src/w32.c
index f17e987f437..c752333c68d 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -5784,7 +5784,10 @@ check_windows_init_file (void)
      it cannot find the Windows installation file.  If this file does
      not exist in the expected place, tell the user.  */
 
-  if (!noninteractive && !inhibit_window_system)
+  if (!noninteractive && !inhibit_window_system
+      /* Vload_path is not yet initialized when we are loading
+	 loadup.el.  */
+      && NILP (Vpurify_flag))
     {
       Lisp_Object objs[2];
       Lisp_Object full_load_path;