diff options
| author |   nicm <nicm@openbsd.org> | 2017-10-26 08:17:12 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2017-10-26 08:17:12 +0000 |
| commit | d0f3ba188fdde4999d4b26be7a03a74621092e88 (patch) | |
| tree | 12e88dc4a5ca3df472a6f9607b56f5478dc710d1 | |
| parent | mark up the rdomain keyword; (diff) | |
| download | wireguard-openbsd-d0f3ba188fdde4999d4b26be7a03a74621092e88.tar.xz wireguard-openbsd-d0f3ba188fdde4999d4b26be7a03a74621092e88.zip | |
Fix crash exiting command prompt (from Alex Maese in GitHub issue 1139)
and a man page tweak from jmc.
| -rw-r--r-- | usr.bin/tmux/tmux.1 | 5 | ||||
| -rw-r--r-- | usr.bin/tmux/window-tree.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1 index 7ae4792d2b5..cb804c7d1e1 100644 --- a/usr.bin/tmux/tmux.1 +++ b/usr.bin/tmux/tmux.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tmux.1,v 1.584 2017/10/25 15:20:10 nicm Exp $ +.\" $OpenBSD: tmux.1,v 1.585 2017/10/26 08:17:12 nicm Exp $ .\" .\" Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> .\" @@ -14,7 +14,7 @@ .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: October 25 2017 $ +.Dd $Mdocdate: October 26 2017 $ .Dt TMUX 1 .Os .Sh NAME @@ -3352,7 +3352,6 @@ All the notifications listed in the section are hooks (without any arguments), except .Ic %exit . The following additional hooks are available: -.Pp .Bl -tag -width "XXXXXXXXXXXXXXXXXXXXXX" .It alert-activity Run when a window has activity. diff --git a/usr.bin/tmux/window-tree.c b/usr.bin/tmux/window-tree.c index bd6bbfe5006..e1c291eefcb 100644 --- a/usr.bin/tmux/window-tree.c +++ b/usr.bin/tmux/window-tree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: window-tree.c,v 1.21 2017/10/25 11:26:11 nicm Exp $ */ +/* $OpenBSD: window-tree.c,v 1.22 2017/10/26 08:17:12 nicm Exp $ */ /* * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -931,7 +931,7 @@ window_tree_command_callback(struct client *c, void *modedata, const char *s, { struct window_tree_modedata *data = modedata; - if (data->dead) + if (s == NULL || data->dead) return (0); data->entered = s; |