summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/cmd-copy-mode.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2015-09-13 13:31:40 +0000
committernicm <nicm@openbsd.org>2015-09-13 13:31:40 +0000
commit47f0136494ac7c4768d11d4de16a0e44e94fe94c (patch)
treedbab9615fafd2fb0d3700d46aea7b47fd3e29603 /usr.bin/tmux/cmd-copy-mode.c
parent- FOO=bar; export FOO -> export FOO=bar (diff)
downloadwireguard-openbsd-47f0136494ac7c4768d11d4de16a0e44e94fe94c.tar.xz
wireguard-openbsd-47f0136494ac7c4768d11d4de16a0e44e94fe94c.zip
Add copy-mode -e to exit copy mode when scrolling off the bottom, useful
for quick view of history, from Cam Hutchison.
Diffstat (limited to 'usr.bin/tmux/cmd-copy-mode.c')
-rw-r--r--usr.bin/tmux/cmd-copy-mode.c8
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 0916be98aeb..08889f2999e 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.20 2015/04/21 15:34:32 nicm Exp $ */
+/* $OpenBSD: cmd-copy-mode.c,v 1.21 2015/09/13 13:31:40 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -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)