diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-05-31 15:56:13 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-05-31 15:56:13 +0100 |
| commit | f17ecaa49544509e93716a84b6510990ed90ceca (patch) | |
| tree | 6b89857ce59fc9330c136961defdcc0923cbff40 /cmd-copy-mode.c | |
| parent | 9c4d0d454aa81b9587ed724e0f87395b1791ce2f (diff) | |
| parent | d60663ea8664d1c71def883bd64d97af3f791f89 (diff) | |
| download | rtmux-f17ecaa49544509e93716a84b6510990ed90ceca.tar.gz rtmux-f17ecaa49544509e93716a84b6510990ed90ceca.tar.bz2 rtmux-f17ecaa49544509e93716a84b6510990ed90ceca.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile.am
cfg.c
server-client.c
Diffstat (limited to 'cmd-copy-mode.c')
| -rw-r--r-- | cmd-copy-mode.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c index 5599bb96..699a868d 100644 --- a/cmd-copy-mode.c +++ b/cmd-copy-mode.c @@ -60,6 +60,7 @@ cmd_copy_mode_exec(struct cmd *self, struct cmdq_item *item) struct client *c = item->client; struct session *s; struct window_pane *wp = item->target.wp; + int flag; if (args_has(args, 'M')) { if ((wp = cmd_mouse_pane(&shared->mouse, &s, NULL)) == NULL) @@ -69,12 +70,13 @@ cmd_copy_mode_exec(struct cmd *self, struct cmdq_item *item) } if (self->entry == &cmd_clock_mode_entry) { - window_pane_set_mode(wp, &window_clock_mode); + window_pane_set_mode(wp, &window_clock_mode, NULL, NULL); return (CMD_RETURN_NORMAL); } if (wp->mode != &window_copy_mode) { - if (window_pane_set_mode(wp, &window_copy_mode) != 0) + flag = window_pane_set_mode(wp, &window_copy_mode, NULL, NULL); + if (flag != 0) return (CMD_RETURN_NORMAL); window_copy_init_from_pane(wp, args_has(self->args, 'e')); } |