From dfaf47d97c3ddc1f2879414ce32d91cf7b0e70ce Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 28 Nov 2025 09:14:17 +0000
Subject: [PATCH 1/2] session_index was never actually implemented, remove from
 man page.

---
 tmux.1 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tmux.1 b/tmux.1
index 51fb4002..832c0881 100644
--- a/tmux.1
+++ b/tmux.1
@@ -6133,7 +6133,6 @@ The following variables are available, where appropriate:
 .It Li "insert_flag" Ta "" Ta "Pane insert flag"
 .It Li "keypad_cursor_flag" Ta "" Ta "Pane keypad cursor flag"
 .It Li "keypad_flag" Ta "" Ta "Pane keypad flag"
-.It Li "last_session_index" Ta "" Ta "Index of last session"
 .It Li "last_window_index" Ta "" Ta "Index of last window in session"
 .It Li "line" Ta "" Ta "Line number in the list"
 .It Li "loop_last_flag" Ta "" Ta "1 if last window, pane, session, client in the W:, P:, S:, or L: loop"
@@ -6225,7 +6224,6 @@ The following variables are available, where appropriate:
 .It Li "session_group_size" Ta "" Ta "Size of session group"
 .It Li "session_grouped" Ta "" Ta "1 if session in a group"
 .It Li "session_id" Ta "" Ta "Unique session ID"
-.It Li "session_index" Ta "" Ta "Index of session"
 .It Li "session_last_attached" Ta "" Ta "Time session last attached"
 .It Li "session_many_attached" Ta "" Ta "1 if multiple clients attached"
 .It Li "session_marked" Ta "" Ta "1 if this session contains the marked pane"

From 55d660a548cbeb8cb3b6975cc67fa1b0b031a4e8 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 28 Nov 2025 09:42:48 +0000
Subject: [PATCH 2/2] Do not remove TERM etc for commands run from config file,
 reported by Dennis Eriksen.

---
 environ.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/environ.c b/environ.c
index fb1c4902..0b4b3c31 100644
--- a/environ.c
+++ b/environ.c
@@ -263,11 +263,6 @@ environ_for_session(struct session *s, int no_TERM)
 		environ_set(env, "TERM_PROGRAM", 0, "%s", "tmux");
 		environ_set(env, "TERM_PROGRAM_VERSION", 0, "%s", getversion());
 		environ_set(env, "COLORTERM", 0, "truecolor");
-	} else {
-		environ_unset(env, "TERM");
-		environ_unset(env, "TERM_PROGRAM");
-		environ_unset(env, "TERM_PROGRAM_VERSION");
-		environ_unset(env, "COLORTERM");
 	}
 
 	if (s != NULL)