From b8ccaf6fb3041fc99edf29e3c9ea9aa1ca04c1bd Mon Sep 17 00:00:00 2001 From: Karoly Lorentey Date: Sun, 11 Sep 2005 03:49:47 +0000 Subject: Make `emacsclient -n ' 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 --- lib-src/emacsclient.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib-src/emacsclient.c') diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index ecd0d18ce85..85415eba44a 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -179,9 +179,9 @@ decode_options (argc, argv) 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) -- cgit v1.2.1