From: Glenn Morris <rgm@gnu.org>
Date: Mon, 20 Apr 2015 21:38:36 +0000 (-0400)
Subject: Tweak exec-path in uninstalled case
X-Git-Tag: emacs-25.0.90~2353
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cf2e9971ea12fb7bfa7700a9693d32ca30f87118;p=emacs.git

Tweak exec-path in uninstalled case

* src/callproc.c (init_callproc): If running uninstalled, do not
include eventual installation libexec directory in exec-path.
---

diff --git a/src/callproc.c b/src/callproc.c
index e1fe8ed95df..12c81439fe4 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);
 	}