[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master cf2e997 1/4: Tweak exec-path in uninstalled case
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master cf2e997 1/4: Tweak exec-path in uninstalled case |
Date: |
Mon, 20 Apr 2015 21:45:14 +0000 |
branch: master
commit cf2e9971ea12fb7bfa7700a9693d32ca30f87118
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Tweak exec-path in uninstalled case
* src/callproc.c (init_callproc): If running uninstalled, do not
include eventual installation libexec directory in exec-path.
---
src/callproc.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/callproc.c b/src/callproc.c
index e1fe8ed..12c8143 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1595,12 +1595,12 @@ init_callproc (void)
#ifdef HAVE_NS
const char *path_exec = ns_exec_path ();
#endif
+ /* Running uninstalled, so default to tem rather than PATH_EXEC. */
Vexec_path = decode_env_path ("EMACSPATH",
#ifdef HAVE_NS
path_exec ? path_exec :
#endif
- PATH_EXEC, 0);
- Vexec_path = Fcons (tem, Vexec_path);
+ SSDATA (tem), 0);
Vexec_path = nconc2 (decode_env_path ("PATH", "", 0), Vexec_path);
}