Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2017-01-10 22:01:14 +00:00
commit 8f79b079cd
2 changed files with 3 additions and 5 deletions

View File

@ -44,13 +44,10 @@ static enum cmd_retval
cmd_clear_history_exec(__unused struct cmd *self, struct cmdq_item *item) cmd_clear_history_exec(__unused struct cmd *self, struct cmdq_item *item)
{ {
struct window_pane *wp = item->state.tflag.wp; struct window_pane *wp = item->state.tflag.wp;
struct grid *gd;
gd = item->state.tflag.wp->base.grid;
if (wp->mode == &window_copy_mode) if (wp->mode == &window_copy_mode)
window_pane_reset_mode(wp); window_pane_reset_mode(wp);
grid_clear_history(gd); grid_clear_history(wp->base.grid);
return (CMD_RETURN_NORMAL); return (CMD_RETURN_NORMAL);
} }

View File

@ -24,7 +24,8 @@
* Refresh client. * Refresh client.
*/ */
static enum cmd_retval cmd_refresh_client_exec(struct cmd *, struct cmdq_item *); static enum cmd_retval cmd_refresh_client_exec(struct cmd *,
struct cmdq_item *);
const struct cmd_entry cmd_refresh_client_entry = { const struct cmd_entry cmd_refresh_client_entry = {
.name = "refresh-client", .name = "refresh-client",