emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 008bc1c: Fix last change


From: Eli Zaretskii
Subject: [Emacs-diffs] master 008bc1c: Fix last change
Date: Mon, 19 Nov 2018 14:52:43 -0500 (EST)

branch: master
commit 008bc1cbc85ac8c95fd0cbd1b41a98f877dae838
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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.
---
 lib-src/emacsclient.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 187d2d7..66ada43 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);
     }



reply via email to

[Prev in Thread] Current Thread [Next in Thread]