Merge branch 'obsd-master'

3 files changed, 0 insertions, 22 deletions

diff --git a/options-table.c b/options-table.c
index bf5e2459..f74b1b10 100644
--- a/options-table.c
+++ b/options-table.c
@@ -319,12 +319,6 @@ const struct options_table_entry options_table[] = {
 	  .default_num = 500
 	},
 
-	{ .name = "set-remain-on-exit",
-	  .type = OPTIONS_TABLE_FLAG,
-	  .scope = OPTIONS_TABLE_SESSION,
-	  .default_num = 0
-	},
-
 	{ .name = "set-titles",
 	  .type = OPTIONS_TABLE_FLAG,
 	  .scope = OPTIONS_TABLE_SESSION,
diff --git a/session.c b/session.c
index da20bab1..4a93a5c5 100644
--- a/session.c
+++ b/session.c
@@ -358,9 +358,6 @@ session_new(struct session *s, const char *name, int argc, char **argv,
 	notify_window_linked(s, w);
 	environ_free(env);
 
-	if (options_get_number(s->options, "set-remain-on-exit"))
-		options_set_number(w->options, "remain-on-exit", 1);
-
 	session_group_synchronize_from(s);
 	return (wl);
 }
diff --git a/tmux.1 b/tmux.1
index b109e079..2ad45dec 100644
--- a/tmux.1
+++ b/tmux.1
@@ -2700,19 +2700,6 @@ flag to
 Repeat is enabled for the default keys bound to the
 .Ic resize-pane
 command.
-.It Xo Ic set-remain-on-exit
-.Op Ic on | off
-.Xc
-Set the
-.Ic remain-on-exit
-window option for any windows first created in this session.
-When this option is true, windows in which the running program has
-exited do not close, instead remaining open but inactivate.
-Use the
-.Ic respawn-window
-command to reactivate such a window, or the
-.Ic kill-window
-command to destroy it.
 .It Xo Ic set-titles
 .Op Ic on | off
 .Xc