aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-01-10 22:01:14 +0000
committerThomas Adam <thomas@xteddy.org>2017-01-10 22:01:14 +0000
commit8f79b079cd5be1e63fb4e05c389c4334c5e7882a (patch)
treeea4c8fc5a1fecda06eb3183dd5fee18bfb6b4a62
parentdb8dff6814fd77c6cc86b9c0009b7afcdd95f196 (diff)
parent55266275587f3bb6f0dfdb1623cb870315a38213 (diff)
downloadrtmux-8f79b079cd5be1e63fb4e05c389c4334c5e7882a.tar.gz
rtmux-8f79b079cd5be1e63fb4e05c389c4334c5e7882a.tar.bz2
rtmux-8f79b079cd5be1e63fb4e05c389c4334c5e7882a.zip
Merge branch 'obsd-master'
-rw-r--r--cmd-clear-history.c5
-rw-r--r--cmd-refresh-client.c3
2 files changed, 3 insertions, 5 deletions
diff --git a/cmd-clear-history.c b/cmd-clear-history.c
index 1afd9053..b5e0f84f 100644
--- a/cmd-clear-history.c
+++ b/cmd-clear-history.c
@@ -44,13 +44,10 @@ static enum cmd_retval
cmd_clear_history_exec(__unused struct cmd *self, struct cmdq_item *item)
{
struct window_pane *wp = item->state.tflag.wp;
- struct grid *gd;
-
- gd = item->state.tflag.wp->base.grid;
if (wp->mode == &window_copy_mode)
window_pane_reset_mode(wp);
- grid_clear_history(gd);
+ grid_clear_history(wp->base.grid);
return (CMD_RETURN_NORMAL);
}
diff --git a/cmd-refresh-client.c b/cmd-refresh-client.c
index b1234f36..289563c6 100644
--- a/cmd-refresh-client.c
+++ b/cmd-refresh-client.c
@@ -24,7 +24,8 @@
* 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 = {
.name = "refresh-client",