circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2017-10-26 10:01:18 +01:00
parent d36ac3db15 e91e8a2a6c
commit cf782c4f54
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tmux.1
View File

@ -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.

2
window-tree.c
View File

@ -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;