diff options
| author | Richard M. Stallman | 1999-07-02 12:57:10 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1999-07-02 12:57:10 +0000 |
| commit | 0fa248bcc0cac1519c0ec75a43e3ba8a2b8f09e6 (patch) | |
| tree | e1d77dbedb151ad8e05a8b4dcdf819ab24061932 /src/callproc.c | |
| parent | df01192be7a249c771330e203a9ff6dbcffd72d9 (diff) | |
| download | emacs-0fa248bcc0cac1519c0ec75a43e3ba8a2b8f09e6.tar.gz emacs-0fa248bcc0cac1519c0ec75a43e3ba8a2b8f09e6.zip | |
(init_callproc): Set exec_directory if installation_directory is
non-nil, without a test of exec_path.
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/callproc.c b/src/callproc.c index d6be8b6ff03..61b25e15e9f 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -1272,14 +1272,13 @@ init_callproc () | |||
| 1272 | Lisp_Object tem; | 1272 | Lisp_Object tem; |
| 1273 | tem = Fexpand_file_name (build_string ("lib-src"), | 1273 | tem = Fexpand_file_name (build_string ("lib-src"), |
| 1274 | Vinstallation_directory); | 1274 | Vinstallation_directory); |
| 1275 | if (NILP (Fmember (tem, Vexec_path))) | ||
| 1276 | { | ||
| 1277 | #ifndef DOS_NT | 1275 | #ifndef DOS_NT |
| 1278 | /* MSDOS uses wrapped binaries, so don't do this. */ | 1276 | /* MSDOS uses wrapped binaries, so don't do this. */ |
| 1279 | Vexec_path = nconc2 (Vexec_path, Fcons (tem, Qnil)); | 1277 | if (NILP (Fmember (tem, Vexec_path))) |
| 1280 | Vexec_directory = Ffile_name_as_directory (tem); | 1278 | Vexec_path = nconc2 (Vexec_path, Fcons (tem, Qnil)); |
| 1279 | |||
| 1280 | Vexec_directory = Ffile_name_as_directory (tem); | ||
| 1281 | #endif /* not DOS_NT */ | 1281 | #endif /* not DOS_NT */ |
| 1282 | } | ||
| 1283 | 1282 | ||
| 1284 | /* Maybe use ../etc as well as ../lib-src. */ | 1283 | /* Maybe use ../etc as well as ../lib-src. */ |
| 1285 | if (data_dir == 0) | 1284 | if (data_dir == 0) |