Merge branch 'obsd-master' into master

pull/2497/head
Thomas Adam 2020-11-30 16:01:22 +00:00
commit 70a5207bd1
2 changed files with 7 additions and 2 deletions

View File

@ -768,7 +768,11 @@ cmdq_running(struct client *c)
{
struct cmdq_list *queue = cmdq_get(c);
return (queue->item);
if (queue->item == NULL)
return (NULL);
if (queue->item->flags & CMDQ_WAITING)
return (NULL);
return (queue->item);
}
/* Print a guard line. */

3
tmux.1
View File

@ -2112,7 +2112,8 @@ and
.Ic display-panes-active-colour
session options.
The indicator is closed when a key is pressed (unless
.Fl N is given) or
.Fl N
is given) or
.Ar duration
milliseconds have passed.
If