# HG changeset patch
# User Karoly Lorentey <lorentey@elte.hu>
# Date 1126410587 0
# Node ID f4766b398a30fed0c09d1e4f587244d04186d1c9
# Parent  5272862a4865d609a49fdc9b581d9491c0a3b9d4
Make `emacsclient -n <filename>' open new X frames when possible. (Reported by Bas Kok.)

* lib-src/emacsclient.c (decode_options): Change --no-wait to imply
  --current-frame only on ttys and only when there are extra arguments.


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

diff -r 5272862a4865 -r f4766b398a30 README.multi-tty
--- a/README.multi-tty	Sun Sep 11 03:15:42 2005 +0000
+++ b/README.multi-tty	Sun Sep 11 03:49:47 2005 +0000
@@ -40,6 +40,7 @@
 Friedrich Delgado Friedrichs <friedel at nomaden dot org>
 IRIE Tetsuya <irie at t dot email dot ne dot jp>
 Yoshiaki Kasahara <kasahara at nc dot kyushu-u dot ac dot jp>
+Bas Kok <nekkobassu at yahoo dot com>
 Jurej Kubelka <Juraj dot Kubelka at email dot cz>
 David Lichteblau <david at lichteblau dot com>
 Xavier Mallard <zedek at gnu-rox dot org>
diff -r 5272862a4865 -r f4766b398a30 lib-src/emacsclient.c
--- a/lib-src/emacsclient.c	Sun Sep 11 03:15:42 2005 +0000
+++ b/lib-src/emacsclient.c	Sun Sep 11 03:49:47 2005 +0000
@@ -179,9 +179,9 @@
   else
     tty = 1;
 
-  /* `emacsclient --no-wait' should open a new permanent frame, then exit.
-     Otherwise, --no-wait always implies --current-frame.  */
-  if (nowait && argc - optind > 0)
+  /* --no-wait implies --current-frame on ttys when there are file
+       arguments or expressions given.  */
+  if (nowait && tty && argc - optind > 0)
     current_frame = 1;
 
   if (current_frame)