summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
authorGregory Heytings <gregory@heytings.org>2022-11-27 23:15:00 +0000
committerGregory Heytings <gregory@heytings.org>2022-11-28 00:16:00 +0100
commit5f97a085bee2d759a59898fd67ef5990b3ab54fa (patch)
tree6ba34f20691f769377c045c55c954281c4badad8 /lib-src
parent6d3cea2c8edde5ee8d6d8fe1364cd318e3270515 (diff)
downloademacs-5f97a085bee2d759a59898fd67ef5990b3ab54fa.tar.gz
Fix incompatible -t and -r options in emacsclient
* lib-src/emacsclient.c (decode_options): Do not allow -t and -r together.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/emacsclient.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index bc23f3fa363..af488128ba7 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -568,6 +568,7 @@ decode_options (int argc, char **argv)
case 't':
tty = true;
create_frame = true;
+ reuse_frame = false;
break;
case 'c':
@@ -576,7 +577,8 @@ decode_options (int argc, char **argv)
case 'r':
create_frame = true;
- reuse_frame = true;
+ if (!tty)
+ reuse_frame = true;
break;
case 'p':