diff options
| author | Geoff Voelker <voelker@cs.washington.edu> | 1998-10-27 23:42:26 +0000 |
|---|---|---|
| committer | Geoff Voelker <voelker@cs.washington.edu> | 1998-10-27 23:42:26 +0000 |
| commit | 96ef7d42fb4cbebbc42c096c7d1a7261069554e3 (patch) | |
| tree | 686f106bf5e1db35f27f53980dcb650766365497 /src/w32.c | |
| parent | 5d84dd87147f39afd4bcb62c86e4db4e8c97a17a (diff) | |
| download | emacs-96ef7d42fb4cbebbc42c096c7d1a7261069554e3.tar.gz | |
(check_windows_init_file): Also look in load path specified
in environment.
Diffstat (limited to 'src/w32.c')
| -rw-r--r-- | src/w32.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/w32.c b/src/w32.c index 8bf8f042fcf..8ec2670a2bf 100644 --- a/src/w32.c +++ b/src/w32.c @@ -3027,14 +3027,17 @@ check_windows_init_file () if (!noninteractive && !inhibit_window_system) { extern Lisp_Object Vwindow_system, Vload_path, Qfile_exists_p; + Lisp_Object full_load_path; Lisp_Object init_file; int fd; init_file = build_string ("term/w32-win"); - fd = openp (Vload_path, init_file, ".el:.elc", NULL, 0); + full_load_path = Fcons (build_string (getenv ("EMACSLOADPATH")), + Vload_path); + fd = openp (full_load_path, init_file, ".el:.elc", NULL, 0); if (fd < 0) { - Lisp_Object load_path_print = Fprin1_to_string (Vload_path, Qnil); + Lisp_Object load_path_print = Fprin1_to_string (full_load_path, Qnil); char *init_file_name = XSTRING (init_file)->data; char *load_path = XSTRING (load_path_print)->data; char *buffer = alloca (1024); |