diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-09-14 12:42:19 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-09-14 12:42:19 +0100 |
| commit | 74b958ecbed7102a0f3f5faf5d976411726661ba (patch) | |
| tree | 7b0cc592b9127fe05afc9bbbf67263489d66eb85 /cmd-copy-mode.c | |
| parent | ef35c9f7659205659d6863058b9a7262b21440a5 (diff) | |
| parent | 16efa8483888e326aed2c05a01b63b45a2b118ef (diff) | |
| download | rtmux-74b958ecbed7102a0f3f5faf5d976411726661ba.tar.gz rtmux-74b958ecbed7102a0f3f5faf5d976411726661ba.tar.bz2 rtmux-74b958ecbed7102a0f3f5faf5d976411726661ba.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile
Diffstat (limited to 'cmd-copy-mode.c')
| -rw-r--r-- | cmd-copy-mode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c index d729ada6..e04b561b 100644 --- a/cmd-copy-mode.c +++ b/cmd-copy-mode.c @@ -28,8 +28,8 @@ enum cmd_retval cmd_copy_mode_exec(struct cmd *, struct cmd_q *); const struct cmd_entry cmd_copy_mode_entry = { "copy-mode", NULL, - "Mt:u", 0, 0, - "[-Mu] " CMD_TARGET_PANE_USAGE, + "Met:u", 0, 0, + "[-Meu] " CMD_TARGET_PANE_USAGE, 0, cmd_copy_mode_exec }; @@ -66,7 +66,7 @@ cmd_copy_mode_exec(struct cmd *self, struct cmd_q *cmdq) 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); + 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) |