aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2018-11-19 21:51:51 +0200
committerEli Zaretskii2018-11-19 21:51:51 +0200
commit008bc1cbc85ac8c95fd0cbd1b41a98f877dae838 (patch)
tree4c5fc2aeab36ac4745ff91ffa805eae1ea7f6426
parent57d5c14d2a390ca9a0a4d9fa934446150ecd16fc (diff)
downloademacs-008bc1cbc85ac8c95fd0cbd1b41a98f877dae838.tar.gz
emacs-008bc1cbc85ac8c95fd0cbd1b41a98f877dae838.zip
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.
-rw-r--r--lib-src/emacsclient.c2
1 files changed, 2 insertions, 0 deletions
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)
1535 d_argv[0] = emacs; 1535 d_argv[0] = emacs;
1536 d_argv[1] = daemon_option; 1536 d_argv[1] = daemon_option;
1537 d_argv[2] = 0; 1537 d_argv[2] = 0;
1538#ifndef NO_SOCKETS_IN_FILE_SYSTEM
1538 if (socket_name != NULL) 1539 if (socket_name != NULL)
1539 { 1540 {
1540 /* Pass --daemon=socket_name as argument. */ 1541 /* Pass --daemon=socket_name as argument. */
@@ -1544,6 +1545,7 @@ start_daemon_and_retry_set_socket (void)
1544 strcpy (stpcpy (daemon_arg, deq), socket_name); 1545 strcpy (stpcpy (daemon_arg, deq), socket_name);
1545 d_argv[1] = daemon_arg; 1546 d_argv[1] = daemon_arg;
1546 } 1547 }
1548#endif
1547 execvp ("emacs", d_argv); 1549 execvp ("emacs", d_argv);
1548 message (true, "%s: error starting emacs daemon\n", progname); 1550 message (true, "%s: error starting emacs daemon\n", progname);
1549 } 1551 }