* 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
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>
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)