From: Geoff Voelker <voelker@cs.washington.edu>
Date: Tue, 27 Oct 1998 23:42:26 +0000 (+0000)
Subject: (check_windows_init_file): Also look in load path specified
X-Git-Tag: emacs-20.4~1390
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=96ef7d42fb4cbebbc42c096c7d1a7261069554e3;p=emacs.git

(check_windows_init_file): Also look in load path specified
in environment.
---

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);