diff options
| author | Geoff Voelker | 1998-12-03 03:14:46 +0000 |
|---|---|---|
| committer | Geoff Voelker | 1998-12-03 03:14:46 +0000 |
| commit | a0b9c8385f11a3ef1d6b669347f19cf7ec6f81e0 (patch) | |
| tree | c4e23d671da52cfc609b45aede8077ae3d9c1980 /src | |
| parent | b57e1c983f16eaca0ad0bf37c67e7c5e86edfcf8 (diff) | |
| download | emacs-a0b9c8385f11a3ef1d6b669347f19cf7ec6f81e0.tar.gz emacs-a0b9c8385f11a3ef1d6b669347f19cf7ec6f81e0.zip | |
(check_windows_init_file): Use decode_env_path when
using EMACSLOADPATH.
Diffstat (limited to 'src')
| -rw-r--r-- | src/w32.c | 6 |
1 files changed, 4 insertions, 2 deletions
| @@ -3028,13 +3028,15 @@ check_windows_init_file () | |||
| 3028 | if (!noninteractive && !inhibit_window_system) | 3028 | if (!noninteractive && !inhibit_window_system) |
| 3029 | { | 3029 | { |
| 3030 | extern Lisp_Object Vwindow_system, Vload_path, Qfile_exists_p; | 3030 | extern Lisp_Object Vwindow_system, Vload_path, Qfile_exists_p; |
| 3031 | Lisp_Object objs[2]; | ||
| 3031 | Lisp_Object full_load_path; | 3032 | Lisp_Object full_load_path; |
| 3032 | Lisp_Object init_file; | 3033 | Lisp_Object init_file; |
| 3033 | int fd; | 3034 | int fd; |
| 3034 | 3035 | ||
| 3036 | objs[0] = Vload_path; | ||
| 3037 | objs[1] = decode_env_path (0, (getenv ("EMACSLOADPATH"))); | ||
| 3038 | full_load_path = Fappend (2, objs); | ||
| 3035 | init_file = build_string ("term/w32-win"); | 3039 | init_file = build_string ("term/w32-win"); |
| 3036 | full_load_path = Fcons (build_string (getenv ("EMACSLOADPATH")), | ||
| 3037 | Vload_path); | ||
| 3038 | fd = openp (full_load_path, init_file, ".el:.elc", NULL, 0); | 3040 | fd = openp (full_load_path, init_file, ".el:.elc", NULL, 0); |
| 3039 | if (fd < 0) | 3041 | if (fd < 0) |
| 3040 | { | 3042 | { |