diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-04-16 10:39:48 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-04-16 10:39:48 +0100 |
| commit | 9e537c808b95e01165f1c2831b3737b93c0110c3 (patch) | |
| tree | c4e0394a8c366356187696f03cf6cd21923ca42a /cmd-copy-mode.c | |
| parent | 4ccb2e2c218a10a8039ca801231aaf09b6bf3bce (diff) | |
| parent | 2c4543b9e9bd38bcc45393dad94930bcde872e6c (diff) | |
| download | rtmux-9e537c808b95e01165f1c2831b3737b93c0110c3.tar.gz rtmux-9e537c808b95e01165f1c2831b3737b93c0110c3.tar.bz2 rtmux-9e537c808b95e01165f1c2831b3737b93c0110c3.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'cmd-copy-mode.c')
| -rw-r--r-- | cmd-copy-mode.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c index f014be83..40584a28 100644 --- a/cmd-copy-mode.c +++ b/cmd-copy-mode.c @@ -54,9 +54,11 @@ cmd_copy_mode_exec(struct cmd *self, struct cmd_q *cmdq) if (cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp) == NULL) return (CMD_RETURN_ERROR); - if (window_pane_set_mode(wp, &window_copy_mode) != 0) - return (CMD_RETURN_NORMAL); - window_copy_init_from_pane(wp); + if (wp->mode != &window_copy_mode) { + if (window_pane_set_mode(wp, &window_copy_mode) != 0) + return (CMD_RETURN_NORMAL); + window_copy_init_from_pane(wp); + } if (wp->mode == &window_copy_mode && args_has(self->args, 'u')) window_copy_pageup(wp); |