From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 19 Nov 2018 19:51:51 +0000 (+0200)
Subject: Fix last change
X-Git-Tag: emacs-27.0.90~4135
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=008bc1cbc85ac8c95fd0cbd1b41a98f877dae838;p=emacs.git

Fix last change

* lib-src/emacsclient.c (start_daemon_and_retry_set_socket)
[!WINDOWSNT]: Condition usage of socket_name on
NO_SOCKETS_IN_FILE_SYSTEM being undefined.
---

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 187d2d7b5be..66ada43908e 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1535,6 +1535,7 @@ start_daemon_and_retry_set_socket (void)
       d_argv[0] = emacs;
       d_argv[1] = daemon_option;
       d_argv[2] = 0;
+#ifndef NO_SOCKETS_IN_FILE_SYSTEM
       if (socket_name != NULL)
 	{
 	  /* Pass  --daemon=socket_name as argument.  */
@@ -1544,6 +1545,7 @@ start_daemon_and_retry_set_socket (void)
 	  strcpy (stpcpy (daemon_arg, deq), socket_name);
 	  d_argv[1] = daemon_arg;
 	}
+#endif
       execvp ("emacs", d_argv);
       message (true, "%s: error starting emacs daemon\n", progname);
     }