summaryrefslogtreecommitdiff
path: root/src/w32.c
diff options
context:
space:
mode:
authorGeoff Voelker <voelker@cs.washington.edu>1998-12-03 03:14:46 +0000
committerGeoff Voelker <voelker@cs.washington.edu>1998-12-03 03:14:46 +0000
commita0b9c8385f11a3ef1d6b669347f19cf7ec6f81e0 (patch)
treec4e23d671da52cfc609b45aede8077ae3d9c1980 /src/w32.c
parentb57e1c983f16eaca0ad0bf37c67e7c5e86edfcf8 (diff)
downloademacs-a0b9c8385f11a3ef1d6b669347f19cf7ec6f81e0.tar.gz
(check_windows_init_file): Use decode_env_path when
using EMACSLOADPATH.
Diffstat (limited to 'src/w32.c')
-rw-r--r--src/w32.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/w32.c b/src/w32.c
index 1a4f632ad3f..46d95057edb 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -3028,13 +3028,15 @@ check_windows_init_file ()
if (!noninteractive && !inhibit_window_system)
{
extern Lisp_Object Vwindow_system, Vload_path, Qfile_exists_p;
+ Lisp_Object objs[2];
Lisp_Object full_load_path;
Lisp_Object init_file;
int fd;
+ objs[0] = Vload_path;
+ objs[1] = decode_env_path (0, (getenv ("EMACSLOADPATH")));
+ full_load_path = Fappend (2, objs);
init_file = build_string ("term/w32-win");
- full_load_path = Fcons (build_string (getenv ("EMACSLOADPATH")),
- Vload_path);
fd = openp (full_load_path, init_file, ".el:.elc", NULL, 0);
if (fd < 0)
{