aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-10-26 10:01:18 +0100
committerThomas Adam <thomas@xteddy.org>2017-10-26 10:01:18 +0100
commitcf782c4f546fb11f3157de7aecff85845b0dbed9 (patch)
tree3fd6d4e3292d6b7b0164cf9ecc7fd0014ac0b1a3
parentd36ac3db15ae90e6cf30ba6bb22ccb584cbeeb46 (diff)
parente91e8a2a6c9bd36309acc58723cb62edc4410931 (diff)
downloadrtmux-cf782c4f546fb11f3157de7aecff85845b0dbed9.tar.gz
rtmux-cf782c4f546fb11f3157de7aecff85845b0dbed9.tar.bz2
rtmux-cf782c4f546fb11f3157de7aecff85845b0dbed9.zip
Merge branch 'obsd-master'
-rw-r--r--tmux.11
-rw-r--r--window-tree.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/tmux.1 b/tmux.1
index fe385106..9a9e5d7a 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3356,7 +3356,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/window-tree.c b/window-tree.c
index 05946160..a58154b8 100644
--- a/window-tree.c
+++ b/window-tree.c
@@ -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;