From 6b2129696fbefe44d0adce1f2a11b4ae477cd07e Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 4 Jun 2015 23:27:51 +0000
Subject: Move the nested check from client to server and compare the client
 tty name to all the pane pty names instead of comparing socket paths. This
 means that "new -d" will work without unsetting $TMUX.

---
 client.c | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'client.c')

diff --git a/client.c b/client.c
index e2ffa546..48109613 100644
--- a/client.c
+++ b/client.c
@@ -222,7 +222,7 @@ client_main(int argc, char **argv, int flags)
 		cmdflags = CMD_STARTSERVER;
 	} else if (argc == 0) {
 		msg = MSG_COMMAND;
-		cmdflags = CMD_STARTSERVER|CMD_CANTNEST;
+		cmdflags = CMD_STARTSERVER;
 	} else {
 		msg = MSG_COMMAND;
 
@@ -240,24 +240,10 @@ client_main(int argc, char **argv, int flags)
 		TAILQ_FOREACH(cmd, &cmdlist->list, qentry) {
 			if (cmd->entry->flags & CMD_STARTSERVER)
 				cmdflags |= CMD_STARTSERVER;
-			if (cmd->entry->flags & CMD_CANTNEST)
-				cmdflags |= CMD_CANTNEST;
 		}
 		cmd_list_free(cmdlist);
 	}
 
-	/*
-	 * Check if this could be a nested session, if the command can't nest:
-	 * if the socket path matches $TMUX, this is probably the same server.
-	 */
-	if (shell_cmd == NULL && environ_path != NULL &&
-	    (cmdflags & CMD_CANTNEST) &&
-	    strcmp(socket_path, environ_path) == 0) {
-		fprintf(stderr, "sessions should be nested with care, "
-		    "unset $TMUX to force\n");
-		return (1);
-	}
-
 	/* Set process title, log and signals now this is the client. */
 	setproctitle("client (%s)", socket_path);
 	logfile("client");
-- 
cgit