aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-08-16 12:01:06 +0100
committerThomas Adam <thomas@xteddy.org>2015-08-16 12:01:06 +0100
commit65b45c9c32de273c2c3f4cbdb90b538016307746 (patch)
treeac00612a4bd70595ad608f1274b40495b248915d
parentf5357ed940bd62fefdcca9791a41ca762db42599 (diff)
parent58b659a26e3c558614155ba351e7f275f277e4d3 (diff)
downloadrtmux-65b45c9c32de273c2c3f4cbdb90b538016307746.tar.gz
rtmux-65b45c9c32de273c2c3f4cbdb90b538016307746.tar.bz2
rtmux-65b45c9c32de273c2c3f4cbdb90b538016307746.zip
Merge branch 'obsd-master'
-rw-r--r--cmd-clear-history.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/cmd-clear-history.c b/cmd-clear-history.c
index e1342880..88dbbcf7 100644
--- a/cmd-clear-history.c
+++ b/cmd-clear-history.c
@@ -45,6 +45,9 @@ cmd_clear_history_exec(struct cmd *self, struct cmd_q *cmdq)
return (CMD_RETURN_ERROR);
gd = wp->base.grid;
+ if (wp->mode == &window_copy_mode)
+ window_pane_reset_mode(wp);
+
grid_move_lines(gd, 0, gd->hsize, gd->sy);
gd->hsize = 0;