aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorKaroly Lorentey2005-09-11 03:49:47 +0000
committerKaroly Lorentey2005-09-11 03:49:47 +0000
commitb8ccaf6fb3041fc99edf29e3c9ea9aa1ca04c1bd (patch)
tree3ee26c47d9f7a15cad0c406c983c709572815d77 /lib-src
parent62af879c72eb791a0e0096ae2c739e8c2649d2fc (diff)
downloademacs-b8ccaf6fb3041fc99edf29e3c9ea9aa1ca04c1bd.tar.gz
emacs-b8ccaf6fb3041fc99edf29e3c9ea9aa1ca04c1bd.zip
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
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/emacsclient.c6
1 files changed, 3 insertions, 3 deletions
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)
179 else 179 else
180 tty = 1; 180 tty = 1;
181 181
182 /* `emacsclient --no-wait' should open a new permanent frame, then exit. 182 /* --no-wait implies --current-frame on ttys when there are file
183 Otherwise, --no-wait always implies --current-frame. */ 183 arguments or expressions given. */
184 if (nowait && argc - optind > 0) 184 if (nowait && tty && argc - optind > 0)
185 current_frame = 1; 185 current_frame = 1;
186 186
187 if (current_frame) 187 if (current_frame)