auto upstream

2 files changed, 7 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 092302d6492..1c7771cb0d9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-02-03  Daniel Colascione  <dancol@dancol.org>
+
+        * emacs.c: Use execvp, not execv, when DAEMON_MUST_EXEC, so that
+        daemon mode works on cygw32 when Emacs is installed and not just
+        during development.
+
 2013-02-02  Paul Eggert  <eggert@cs.ucla.edu>
 
         Avoid file time stamp bug on MS-Windows (Bug#13149).
diff --git a/src/emacs.c b/src/emacs.c
index ff29a042ea0..43fcae8e062 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1062,7 +1062,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
 
             argv[skip_args] = fdStr;
 
-            execv (argv[0], argv);
+            execvp (argv[0], argv);
             fprintf (stderr, "emacs daemon: exec failed: %d\n", errno);
             exit (1);
           }