aboutsummaryrefslogtreecommitdiff
path: root/cmd-queue.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-05-31 15:56:13 +0100
committerThomas Adam <thomas@xteddy.org>2017-05-31 15:56:13 +0100
commitf17ecaa49544509e93716a84b6510990ed90ceca (patch)
tree6b89857ce59fc9330c136961defdcc0923cbff40 /cmd-queue.c
parent9c4d0d454aa81b9587ed724e0f87395b1791ce2f (diff)
parentd60663ea8664d1c71def883bd64d97af3f791f89 (diff)
downloadrtmux-f17ecaa49544509e93716a84b6510990ed90ceca.tar.gz
rtmux-f17ecaa49544509e93716a84b6510990ed90ceca.tar.bz2
rtmux-f17ecaa49544509e93716a84b6510990ed90ceca.zip
Merge branch 'obsd-master'
Conflicts: Makefile.am cfg.c server-client.c
Diffstat (limited to 'cmd-queue.c')
-rw-r--r--cmd-queue.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd-queue.c b/cmd-queue.c
index b0885965..8d89e990 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -428,7 +428,8 @@ cmdq_print(struct cmdq_item *item, const char *fmt, ...)
w = c->session->curw->window;
if (w->active->mode != &window_copy_mode) {
window_pane_reset_mode(w->active);
- window_pane_set_mode(w->active, &window_copy_mode);
+ window_pane_set_mode(w->active, &window_copy_mode, NULL,
+ NULL);
window_copy_init_for_output(w->active);
}
window_copy_vadd(w->active, fmt, ap);