Fix --no-wait in emacsclient (reported by Dan Nicolaescu).

* lib-src/emacsclient.c (main): Don't exit prematurely on --no-wait,
  let Emacs close the connection for us.

* lisp/server.el (server-visit-files): Don't set client-record when nowait.



git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-205

2 files changed, 4 insertions, 7 deletions

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index a241a17eb60..888c85e8685 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;
diff --git a/lisp/server.el b/lisp/server.el
index 71db27cc20d..1bf276a26d0 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -679,8 +679,8 @@ so don't mark these buffers specially, just visit them normally."
         (unless nowait
           ;; When the buffer is killed, inform the clients.
           (add-hook 'kill-buffer-hook 'server-kill-buffer nil t)
-          (push (car client) server-buffer-clients))
-        (push (current-buffer) client-record)))
+          (push (car client) server-buffer-clients)
+          (push (current-buffer) client-record))))
     (server-client-set
      client 'buffers
      (nconc (server-client-get client 'buffers) client-record))))