Commit 80667d53 authored by Richard M. Stallman's avatar Richard M. Stallman

(init_lread): Normally put Vinvocation_directory

at end of Vload_path, if not present already.
parent 53a05194
......@@ -1784,7 +1784,20 @@ init_lread ()
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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment