diff options
| author | Eli Zaretskii | 2011-11-07 18:42:34 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2011-11-07 18:42:34 +0200 |
| commit | c7aa8333556ef20b5e49143271e0331988c15f01 (patch) | |
| tree | 66e1d9ad32d43ad4a057fe55cc5274881d6bcb80 /src | |
| parent | 05a61ee3e61026ee010206355509a2d0e7ec15c2 (diff) | |
| download | emacs-c7aa8333556ef20b5e49143271e0331988c15f01.tar.gz emacs-c7aa8333556ef20b5e49143271e0331988c15f01.zip | |
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.
Diffstat (limited to 'src')
| -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 5b406a7bc46..3594a83eb5f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2011-11-07 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * w32.c (check_windows_init_file): Don't look for term/w32-win.el | ||
| 4 | if Vpurify_flag is non-nil. Fixes a crash when running w32 build | ||
| 5 | of temacs in GUI mode. | ||
| 6 | |||
| 1 | 2011-11-07 Martin Rudalics <rudalics@gmx.at> | 7 | 2011-11-07 Martin Rudalics <rudalics@gmx.at> |
| 2 | 8 | ||
| 3 | * window.h: Declare delete_all_child_windows instead of | 9 | * window.h: Declare delete_all_child_windows instead of |
| @@ -5784,7 +5784,10 @@ check_windows_init_file (void) | |||
| 5784 | it cannot find the Windows installation file. If this file does | 5784 | it cannot find the Windows installation file. If this file does |
| 5785 | not exist in the expected place, tell the user. */ | 5785 | not exist in the expected place, tell the user. */ |
| 5786 | 5786 | ||
| 5787 | if (!noninteractive && !inhibit_window_system) | 5787 | if (!noninteractive && !inhibit_window_system |
| 5788 | /* Vload_path is not yet initialized when we are loading | ||
| 5789 | loadup.el. */ | ||
| 5790 | && NILP (Vpurify_flag)) | ||
| 5788 | { | 5791 | { |
| 5789 | Lisp_Object objs[2]; | 5792 | Lisp_Object objs[2]; |
| 5790 | Lisp_Object full_load_path; | 5793 | Lisp_Object full_load_path; |