Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-24 05:47:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

(init_cmdargs): Allow `installation-directory'

Browse source 
to be set if either `lib-src' or `info' are found as its
subdirectories or siblings.
This commit is contained in:
Richard M. Stallman 1997-01-13 21:42:33 +00:00
parent a41284da64
commit de004cc6b4
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/emacs.c
View file

@ -270,7 +270,14 @@ init_cmdargs (argc, argv, skip_args)
not including lisp and info. */
tem = Fexpand_file_name (build_string ("lib-src"), dir);
lib_src_exists = Ffile_exists_p (tem);
if (!NILP (lib_src_exists))
/* MSDOS installations frequently remove lib-src, but we still
must set installation-directory, or else info won't find
its files (it uses the value of installation-directory). */
tem = Fexpand_file_name (build_string ("info"), dir);
info_exists = Ffile_exists_p (tem);
if (!NILP (lib_src_exists) || !NILP (info_exists))
{
tem = Fexpand_file_name (build_string ("etc"), dir);
etc_exists = Ffile_exists_p (tem);
@ -285,7 +292,11 @@ init_cmdargs (argc, argv, skip_args)
/* See if dir's parent contains those subdirs. */
tem = Fexpand_file_name (build_string ("../lib-src"), dir);
lib_src_exists = Ffile_exists_p (tem);
if (!NILP (lib_src_exists))
tem = Fexpand_file_name (build_string ("../info"), dir);
info_exists = Ffile_exists_p (tem);
if (!NILP (lib_src_exists) || !NILP (info_exists))
{
tem = Fexpand_file_name (build_string ("../etc"), dir);
etc_exists = Ffile_exists_p (tem);