changeset 4482:09d0f4b26641

(init_lread): Normally put Vinvocation_directory at end of Vload_path, if not present already.
author Richard M. Stallman <rms@gnu.org>
date Sun, 08 Aug 1993 05:01:06 +0000
parents c40febdb9967
children 6894dd27c9ec
files src/lread.c
diffstat 1 files changed, 14 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/lread.c	Sun Aug 08 05:00:25 1993 +0000
+++ b/src/lread.c	Sun Aug 08 05:01:06 1993 +0000
@@ -1784,7 +1784,20 @@
 
       dump_path = decode_env_path (0, PATH_DUMPLOADSEARCH);
       if (! NILP (Fequal (dump_path, Vload_path)))
-	Vload_path = decode_env_path (0, normal);
+	{
+	  Vload_path = decode_env_path (0, normal);
+	  if (!NILP (Vinvocation_directory))
+	    {
+	      /* Add to the path the ../lisp dir of the Emacs executable,
+		 if that dir exists.  */
+	      Lisp_Object tem, tem1;
+	      tem = Fexpand_file_name (build_string ("../lisp"),
+				       Vinvocation_directory);
+	      tem1 = Ffile_exists_p (tem);
+	      if (!NILP (tem1) && NILP (Fmember (tem, Vload_path)))
+		Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil));
+	    }
+	}
     }
   else
     Vload_path = decode_env_path (0, normal);