master 5f97a085be: Fix incompatible -t and -r options in emacsclient

[Gregory Heytings]

branch: master
commit 5f97a085bee2d759a59898fd67ef5990b3ab54fa
Author: Gregory Heytings <gregory@heytings.org>
Commit: Gregory Heytings <gregory@heytings.org>

    Fix incompatible -t and -r options in emacsclient
    
    * lib-src/emacsclient.c (decode_options): Do not allow -t and -r
    together.
---
 lib-src/emacsclient.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index bc23f3fa36..af488128ba 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':