aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1994-01-17 00:44:38 +0000
committerRichard M. Stallman1994-01-17 00:44:38 +0000
commit74180aa4ea4bf379947251a929eae8ff8a35de43 (patch)
treeb89b1511cce9f67646bd16def7579b3310daee28 /src
parent89de89c7d16c384ccb68b9d06c8422db92965e3c (diff)
downloademacs-74180aa4ea4bf379947251a929eae8ff8a35de43.tar.gz
emacs-74180aa4ea4bf379947251a929eae8ff8a35de43.zip
(init_lread): Use Vinstallation_directory.
Diffstat (limited to 'src')
-rw-r--r--src/lread.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/lread.c b/src/lread.c
index 6c2854a15b8..2ee7fbf12cc 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1849,15 +1849,14 @@ init_lread ()
1849 if (! NILP (Fequal (dump_path, Vload_path))) 1849 if (! NILP (Fequal (dump_path, Vload_path)))
1850 { 1850 {
1851 Vload_path = decode_env_path (0, normal); 1851 Vload_path = decode_env_path (0, normal);
1852 if (!NILP (Vinvocation_directory)) 1852 if (!NILP (Vinstallation_directory))
1853 { 1853 {
1854 /* Add to the path the ../lisp dir of the Emacs executable, 1854 /* Add to the path the lisp subdir of the
1855 if that dir exists. */ 1855 installation dir. */
1856 Lisp_Object tem, tem1; 1856 Lisp_Object tem;
1857 tem = Fexpand_file_name (build_string ("../lisp"), 1857 tem = Fexpand_file_name (build_string ("lisp"),
1858 Vinvocation_directory); 1858 Vinstallation_directory);
1859 tem1 = Ffile_exists_p (tem); 1859 if (NILP (Fmember (tem, Vload_path)))
1860 if (!NILP (tem1) && NILP (Fmember (tem, Vload_path)))
1861 Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil)); 1860 Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil));
1862 } 1861 }
1863 } 1862 }