From: Gregory Heytings <gregory@heytings.org>
Date: Sun, 27 Nov 2022 23:15:00 +0000 (+0000)
Subject: Fix incompatible -t and -r options in emacsclient
X-Git-Tag: emacs-29.0.90~1444
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5f97a085bee2d759a59898fd67ef5990b3ab54fa;p=emacs.git

Fix incompatible -t and -r options in emacsclient

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

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