Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-23 21:37:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Small init_lread fix for bug#10208

Browse source 
* src/lread.c (init_lread): If no_site_lisp, exclude site-lisp/ in
installation and source directories as well.
This commit is contained in:
Glenn Morris 2011-12-06 21:16:53 -05:00
parent 86ed9fdc57
commit 7efa6272f0
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2011-12-07 Glenn Morris <rgm@gnu.org>
* lread.c (init_lread): If no_site_lisp, exclude site-lisp/ in
installation and source directories as well. (Bug#10208)
2011-12-06 Chong Yidong <cyd@gnu.org>
* minibuf.c (Fread_from_minibuffer): Doc fix (Bug#10228).

26
src/lread.c
View file

@ -4180,13 +4180,16 @@ init_lread (void)
}
/* Add site-lisp under the installation dir, if it exists. */
tem = Fexpand_file_name (build_string ("site-lisp"),
Vinstallation_directory);
tem1 = Ffile_exists_p (tem);
if (!NILP (tem1))
if (!no_site_lisp)
{
if (NILP (Fmember (tem, Vload_path)))
Vload_path = Fcons (tem, Vload_path);
tem = Fexpand_file_name (build_string ("site-lisp"),
Vinstallation_directory);
tem1 = Ffile_exists_p (tem);
if (!NILP (tem1))
{
if (NILP (Fmember (tem, Vload_path)))
Vload_path = Fcons (tem, Vload_path);
}
}
/* If Emacs was not built in the source directory,
@ -4222,11 +4225,14 @@ init_lread (void)
if (NILP (Fmember (tem, Vload_path)))
Vload_path = Fcons (tem, Vload_path);
tem = Fexpand_file_name (build_string ("site-lisp"),
Vsource_directory);
if (!no_site_lisp)
{
tem = Fexpand_file_name (build_string ("site-lisp"),
Vsource_directory);
if (NILP (Fmember (tem, Vload_path)))
Vload_path = Fcons (tem, Vload_path);
if (NILP (Fmember (tem, Vload_path)))
Vload_path = Fcons (tem, Vload_path);
}
}
}
if (!NILP (sitelisp) && !no_site_lisp)