diff options
| author |   nicm <nicm@openbsd.org> | 2010-01-23 17:49:21 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2010-01-23 17:49:21 +0000 |
| commit | 966bc17e35e15fc5edc867c749017100f7713404 (patch) | |
| tree | 057c0e5e291a867dfea95d020bc92c0193dad2c5 | |
| parent | finally, 6250 parts need crystal calibration too. (diff) | |
| download | wireguard-openbsd-966bc17e35e15fc5edc867c749017100f7713404.tar.xz wireguard-openbsd-966bc17e35e15fc5edc867c749017100f7713404.zip | |
Use C-e and C-y for scrolling in vi mode, from Micah Cowan.
| -rw-r--r-- | usr.bin/tmux/mode-key.c | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.1 | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/usr.bin/tmux/mode-key.c b/usr.bin/tmux/mode-key.c index 61a22e5fb3b..a70b3f5e9e8 100644 --- a/usr.bin/tmux/mode-key.c +++ b/usr.bin/tmux/mode-key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mode-key.c,v 1.25 2009/12/03 22:50:10 nicm Exp $ */ +/* $OpenBSD: mode-key.c,v 1.26 2010/01/23 17:49:21 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -172,9 +172,11 @@ const struct mode_key_entry mode_key_vi_copy[] = { { '\002' /* C-b */, 0, MODEKEYCOPY_PREVIOUSPAGE }, { '\003' /* C-c */, 0, MODEKEYCOPY_CANCEL }, { '\004' /* C-d */, 0, MODEKEYCOPY_HALFPAGEDOWN }, + { '\005' /* C-e */, 0, MODEKEYCOPY_SCROLLDOWN }, { '\006' /* C-f */, 0, MODEKEYCOPY_NEXTPAGE }, { '\010' /* C-h */, 0, MODEKEYCOPY_LEFT }, { '\025' /* C-u */, 0, MODEKEYCOPY_HALFPAGEUP }, + { '\031' /* C-y */, 0, MODEKEYCOPY_SCROLLUP }, { '\033' /* Escape */, 0, MODEKEYCOPY_CLEARSELECTION }, { '\r', 0, MODEKEYCOPY_COPYSELECTION }, { '^', 0, MODEKEYCOPY_BACKTOINDENTATION }, diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1 index 64640005fe9..1abd28ad101 100644 --- a/usr.bin/tmux/tmux.1 +++ b/usr.bin/tmux/tmux.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tmux.1,v 1.140 2010/01/19 21:27:47 nicm Exp $ +.\" $OpenBSD: tmux.1,v 1.141 2010/01/23 17:49:21 nicm Exp $ .\" .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> .\" @@ -14,7 +14,7 @@ .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: January 19 2010 $ +.Dd $Mdocdate: January 23 2010 $ .Dt TMUX 1 .Os .Sh NAME @@ -535,7 +535,7 @@ The keys available depend on whether emacs or vi mode is selected .Ic mode-keys option). The following keys are supported as appropriate for the mode: -.Bl -column "FunctionXXXXXXXXXXXX" "viXXXXXXXXX" "emacs" -offset indent +.Bl -column "FunctionXXXXXXXXXXXX" "viXXXXXXXXXX" "emacs" -offset indent .It Sy "Function" Ta Sy "vi" Ta Sy "emacs" .It Li "Back to indentation" Ta "^" Ta "M-m" .It Li "Clear selection" Ta "Escape" Ta "C-g" @@ -559,8 +559,8 @@ The following keys are supported as appropriate for the mode: .It Li "Previous page" Ta "C-b" Ta "Page up" .It Li "Previous word" Ta "b" Ta "M-b" .It Li "Quit mode" Ta "q" Ta "Escape" -.It Li "Scroll down" Ta "C-Down or J" Ta "C-Down" -.It Li "Scroll up" Ta "C-Up or K" Ta "C-Up" +.It Li "Scroll down" Ta "C-Down or C-e" Ta "C-Down" +.It Li "Scroll up" Ta "C-Up or C-y" Ta "C-Up" .It Li "Search again" Ta "n" Ta "n" .It Li "Search backward" Ta "?" Ta "C-r" .It Li "Search forward" Ta "/" Ta "C-s" |