Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2015-08-16 12:01:06 +01:00
commit 65b45c9c32

View File

@ -45,6 +45,9 @@ cmd_clear_history_exec(struct cmd *self, struct cmd_q *cmdq)
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);
gd = wp->base.grid; gd = wp->base.grid;
if (wp->mode == &window_copy_mode)
window_pane_reset_mode(wp);
grid_move_lines(gd, 0, gd->hsize, gd->sy); grid_move_lines(gd, 0, gd->hsize, gd->sy);
gd->hsize = 0; gd->hsize = 0;