# HG changeset patch
# User Karoly Lorentey <lorentey@elte.hu>
# Date 1088877237 0
# Node ID ed82e09208c99b58095ad5cbbdb252541016c72b
# Parent  e8df1878cfd16eb430b644144b362eeb3cb9bdd3
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

diff -r e8df1878cfd1 -r ed82e09208c9 lib-src/emacsclient.c
--- a/lib-src/emacsclient.c	Sat Jul 03 17:01:39 2004 +0000
+++ b/lib-src/emacsclient.c	Sat Jul 03 17:53:57 2004 +0000
@@ -814,11 +814,8 @@
   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 -r e8df1878cfd1 -r ed82e09208c9 lisp/server.el
--- a/lisp/server.el	Sat Jul 03 17:01:39 2004 +0000
+++ b/lisp/server.el	Sat Jul 03 17:53:57 2004 +0000
@@ -679,8 +679,8 @@
 	(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))))