X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/a596810c6c3c3c2fd450717f5083a5ff5207d243..b38a3aa6638889ec772a0e26083e570f051a6cab:/lib-src/emacsclient.c?ds=sidebyside

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index a241a17eb6..888c85e868 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -814,11 +814,8 @@ To start the server in Emacs, type \"M-x server-start\".\n",
   fflush (out);
   fsync (fileno (out));
 
-  /* Maybe wait for an answer.   */
-  if (nowait)
-    return EXIT_SUCCESS;
-
-  if (!eval && !tty)
+  /* Wait for an answer. */
+  if (!eval && !tty && !nowait)
     {
       printf ("Waiting for Emacs...");
       needlf = 2;