Fix incompatible -t and -r options in emacsclient

* lib-src/emacsclient.c (decode_options): Do not allow -t and -r
together.

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':