diff options
author | 2016-10-13 21:37:03 +0000 | |
---|---|---|
committer | 2016-10-13 21:37:03 +0000 | |
commit | 8dbdd8a7110c7da06f827187fb3828a3a02290a0 (patch) | |
tree | dfd65d453515dfad5c4a89d0b5462780d279cd30 | |
parent | rcsnum_free() -> free() cleanups. From Michael W. Bombardieri. (diff) | |
download | wireguard-openbsd-8dbdd8a7110c7da06f827187fb3828a3a02290a0.tar.xz wireguard-openbsd-8dbdd8a7110c7da06f827187fb3828a3a02290a0.zip |
Remove the set-remain-on-exit option, it was always a hack and can now
be done with hooks instead.
-rw-r--r-- | usr.bin/tmux/options-table.c | 8 | ||||
-rw-r--r-- | usr.bin/tmux/session.c | 5 | ||||
-rw-r--r-- | usr.bin/tmux/tmux.1 | 15 |
3 files changed, 3 insertions, 25 deletions
diff --git a/usr.bin/tmux/options-table.c b/usr.bin/tmux/options-table.c index b978779614c..768d501fd5e 100644 --- a/usr.bin/tmux/options-table.c +++ b/usr.bin/tmux/options-table.c @@ -1,4 +1,4 @@ -/* $OpenBSD: options-table.c,v 1.74 2016/10/03 22:52:11 nicm Exp $ */ +/* $OpenBSD: options-table.c,v 1.75 2016/10/13 21:37:03 nicm Exp $ */ /* * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -320,12 +320,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/usr.bin/tmux/session.c b/usr.bin/tmux/session.c index 737979c93bd..1bd428bc45d 100644 --- a/usr.bin/tmux/session.c +++ b/usr.bin/tmux/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.64 2016/10/11 13:21:59 nicm Exp $ */ +/* $OpenBSD: session.c,v 1.65 2016/10/13 21:37:03 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -359,9 +359,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/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1 index d299814d0f5..87d4a016b4c 100644 --- a/usr.bin/tmux/tmux.1 +++ b/usr.bin/tmux/tmux.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tmux.1,v 1.503 2016/10/13 20:09:19 nicm Exp $ +.\" $OpenBSD: tmux.1,v 1.504 2016/10/13 21:37:03 nicm Exp $ .\" .\" Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> .\" @@ -2696,19 +2696,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 |