summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/cmd-capture-pane.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2019-03-12 11:16:49 +0000
committernicm <nicm@openbsd.org>2019-03-12 11:16:49 +0000
commit2c8678f77a1ff1cce3579aa4c6553911c9f4dde2 (patch)
treea58e089f82315aac5e2eef457bff6c90afac2435 /usr.bin/tmux/cmd-capture-pane.c
parentAlmost all terminals now support hardware tabs so default to OXTABS (diff)
downloadwireguard-openbsd-2c8678f77a1ff1cce3579aa4c6553911c9f4dde2.tar.xz
wireguard-openbsd-2c8678f77a1ff1cce3579aa4c6553911c9f4dde2.zip
Allow multiple modes to be open in a pane. A stack of open modes is kept
and the previous restored when the top is exited. If a mode that is already on the stack is entered, the existing instance is moved to the top as the active mode rather than being opened new.
Diffstat (limited to 'usr.bin/tmux/cmd-capture-pane.c')
-rw-r--r--usr.bin/tmux/cmd-capture-pane.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/tmux/cmd-capture-pane.c b/usr.bin/tmux/cmd-capture-pane.c
index 5d094f3014d..4ba9030753b 100644
--- a/usr.bin/tmux/cmd-capture-pane.c
+++ b/usr.bin/tmux/cmd-capture-pane.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-capture-pane.c,v 1.45 2019/03/07 20:24:21 nicm Exp $ */
+/* $OpenBSD: cmd-capture-pane.c,v 1.46 2019/03/12 11:16:49 nicm Exp $ */
/*
* Copyright (c) 2009 Jonathan Alvarado <radobobo@users.sourceforge.net>
@@ -199,8 +199,7 @@ cmd_capture_pane_exec(struct cmd *self, struct cmdq_item *item)
size_t len;
if (self->entry == &cmd_clear_history_entry) {
- if (wp->mode != NULL && wp->mode->mode == &window_copy_mode)
- window_pane_reset_mode(wp);
+ window_pane_reset_mode_all(wp);
grid_clear_history(wp->base.grid);
return (CMD_RETURN_NORMAL);
}