mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-19 04:21:45 -07:00
Code Issues Projects Releases Wiki Activity

(init_callproc): Set Vdata_directory based on the source

Browse source 
location whenever Emacs was not run installed.
This commit is contained in:
Richard M. Stallman 2001-12-07 06:46:45 +00:00
parent 120d77d821
commit 70ec13773a
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2001-12-07 Richard M. Stallman <rms@gnu.org>
* callproc.c (init_callproc): Set Vdata_directory based on the source
location whenever Emacs was run uninstalled.
2001-12-06 Paul Eggert <eggert@twinsun.com>
* config.in (HAVE_WORKING_VFORK): New #undefs.

13
src/callproc.c
View file

@ -1489,7 +1489,11 @@ init_callproc ()
#ifndef DOS_NT
/* MSDOS uses wrapped binaries, so don't do this. */
if (NILP (Fmember (tem, Vexec_path)))
Vexec_path = nconc2 (Vexec_path, Fcons (tem, Qnil));
{
Vexec_path = decode_env_path ("EMACSPATH", PATH_EXEC);
Vexec_path = Fcons (tem, Vexec_path);
Vexec_path = nconc2 (decode_env_path ("PATH", ""), Vexec_path);
}
Vexec_directory = Ffile_name_as_directory (tem);
#endif /* not DOS_NT */
@ -1512,12 +1516,15 @@ init_callproc ()
source directory. */
if (data_dir == 0)
{
Lisp_Object tem, tem1, newdir;
Lisp_Object tem, tem1, srcdir;
srcdir = Fexpand_file_name (build_string ("../src/"),
build_string (PATH_DUMPLOADSEARCH));
tem = Fexpand_file_name (build_string ("GNU"), Vdata_directory);
tem1 = Ffile_exists_p (tem);
if (NILP (tem1))
if (!NILP (Fequal (srcdir, Vinvocation_directory)) || NILP (tem1))
{
Lisp_Object newdir;
newdir = Fexpand_file_name (build_string ("../etc/"),
build_string (PATH_DUMPLOADSEARCH));
tem = Fexpand_file_name (build_string ("GNU"), newdir);