diff options
| author |   nicm <nicm@openbsd.org> | 2019-03-07 20:24:21 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2019-03-07 20:24:21 +0000 |
| commit | 30a94f4585db9f50fb6a1c23caadbbef26c4afb1 (patch) | |
| tree | 5acdc4f9378c915db3f7695fec401a063aec6e0a /usr.bin/tmux/cmd-copy-mode.c | |
| parent | Tidy changing the mode into window_copy_init_for_output. (diff) | |
| download | wireguard-openbsd-30a94f4585db9f50fb6a1c23caadbbef26c4afb1.tar.xz wireguard-openbsd-30a94f4585db9f50fb6a1c23caadbbef26c4afb1.zip | |
Add a separate mode struct for the active window mode if any.
Diffstat (limited to 'usr.bin/tmux/cmd-copy-mode.c')
| -rw-r--r-- | usr.bin/tmux/cmd-copy-mode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/tmux/cmd-copy-mode.c b/usr.bin/tmux/cmd-copy-mode.c index 6a957daa66a..f0e41213ba7 100644 --- a/usr.bin/tmux/cmd-copy-mode.c +++ b/usr.bin/tmux/cmd-copy-mode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-copy-mode.c,v 1.34 2017/05/30 21:44:59 nicm Exp $ */ +/* $OpenBSD: cmd-copy-mode.c,v 1.35 2019/03/07 20:24:21 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -74,18 +74,18 @@ cmd_copy_mode_exec(struct cmd *self, struct cmdq_item *item) return (CMD_RETURN_NORMAL); } - if (wp->mode != &window_copy_mode) { + if (wp->mode == NULL || wp->mode->mode != &window_copy_mode) { 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')); } if (args_has(args, 'M')) { - if (wp->mode != NULL && wp->mode != &window_copy_mode) + if (wp->mode != NULL && wp->mode->mode != &window_copy_mode) return (CMD_RETURN_NORMAL); window_copy_start_drag(c, &shared->mouse); } - if (wp->mode == &window_copy_mode && args_has(self->args, 'u')) + if (args_has(self->args, 'u')) window_copy_pageup(wp, 0); return (CMD_RETURN_NORMAL); |