]> git.eshelyaron.com Git - emacs.git/commitdiff
Tweak exec-path in uninstalled case
authorGlenn Morris <rgm@gnu.org>
Mon, 20 Apr 2015 21:38:36 +0000 (17:38 -0400)
committerGlenn Morris <rgm@gnu.org>
Mon, 20 Apr 2015 21:38:36 +0000 (17:38 -0400)
* src/callproc.c (init_callproc): If running uninstalled, do not
include eventual installation libexec directory in exec-path.

src/callproc.c

index e1fe8ed95dfc49c853b202b82597b15adafa0b2e..12c81439fe4f8dfaf62c63ab66d45818456db0ac 100644 (file)
@@ -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);
        }