diff options
author | Eli Zaretskii <[email protected]> | 2011-11-07 18:42:34 +0200 |
---|---|---|
committer | Eli Zaretskii <[email protected]> | 2011-11-07 18:42:34 +0200 |
commit | c7aa8333556ef20b5e49143271e0331988c15f01 (patch) | |
tree | 66e1d9ad32d43ad4a057fe55cc5274881d6bcb80 | |
parent | 05a61ee3e61026ee010206355509a2d0e7ec15c2 (diff) |
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.
-rw-r--r-- | src/ChangeLog | 6 | ||||
-rw-r--r-- | src/w32.c | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5b406a7bc4..3594a83eb5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2011-11-07 Eli Zaretskii <[email protected]> + + * 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 <[email protected]> * window.h: Declare delete_all_child_windows instead of @@ -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; |