[Emacs-diffs] /srv/bzr/emacs/trunk r106314: Allow to run temacs.exe on MS-Windows in GUI mode.

[Eli Zaretskii]

------------------------------------------------------------
revno: 106314
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2011-11-07 18:42:34 +0200
message:
  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.
modified:
  src/ChangeLog
  src/w32.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-11-07 09:51:08 +0000
+++ b/src/ChangeLog     2011-11-07 16:42:34 +0000
@@ -1,3 +1,9 @@
+2011-11-07  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * window.h: Declare delete_all_child_windows instead of

=== modified file 'src/w32.c'
--- a/src/w32.c 2011-11-05 11:34:56 +0000
+++ b/src/w32.c 2011-11-07 16:42:34 +0000
@@ -5784,7 +5784,10 @@
      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;