diff options
| -rw-r--r-- | src/w32.c | 7 |
1 files changed, 5 insertions, 2 deletions
| @@ -3027,14 +3027,17 @@ check_windows_init_file () | |||
| 3027 | if (!noninteractive && !inhibit_window_system) | 3027 | if (!noninteractive && !inhibit_window_system) |
| 3028 | { | 3028 | { |
| 3029 | extern Lisp_Object Vwindow_system, Vload_path, Qfile_exists_p; | 3029 | extern Lisp_Object Vwindow_system, Vload_path, Qfile_exists_p; |
| 3030 | Lisp_Object full_load_path; | ||
| 3030 | Lisp_Object init_file; | 3031 | Lisp_Object init_file; |
| 3031 | int fd; | 3032 | int fd; |
| 3032 | 3033 | ||
| 3033 | init_file = build_string ("term/w32-win"); | 3034 | init_file = build_string ("term/w32-win"); |
| 3034 | fd = openp (Vload_path, init_file, ".el:.elc", NULL, 0); | 3035 | full_load_path = Fcons (build_string (getenv ("EMACSLOADPATH")), |
| 3036 | Vload_path); | ||
| 3037 | fd = openp (full_load_path, init_file, ".el:.elc", NULL, 0); | ||
| 3035 | if (fd < 0) | 3038 | if (fd < 0) |
| 3036 | { | 3039 | { |
| 3037 | Lisp_Object load_path_print = Fprin1_to_string (Vload_path, Qnil); | 3040 | Lisp_Object load_path_print = Fprin1_to_string (full_load_path, Qnil); |
| 3038 | char *init_file_name = XSTRING (init_file)->data; | 3041 | char *init_file_name = XSTRING (init_file)->data; |
| 3039 | char *load_path = XSTRING (load_path_print)->data; | 3042 | char *load_path = XSTRING (load_path_print)->data; |
| 3040 | char *buffer = alloca (1024); | 3043 | char *buffer = alloca (1024); |