diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2010-01-25 17:11:42 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2010-01-25 17:11:42 +0000 |
| commit | 05e5bc78820633c152c15a305f12d849f0ed0b83 (patch) | |
| tree | 9ae1d2e78aeb3a5dbae048b8d87e63849a58634c | |
| parent | 62822cc78d6c9c6d4e9cc663edec46c34203eda4 (diff) | |
| download | rtmux-05e5bc78820633c152c15a305f12d849f0ed0b83.tar.gz rtmux-05e5bc78820633c152c15a305f12d849f0ed0b83.tar.bz2 rtmux-05e5bc78820633c152c15a305f12d849f0ed0b83.zip | |
Sync OpenBSD patchset 613:
Use C-e and C-y for scrolling in vi mode, from Micah Cowan.
| -rw-r--r-- | mode-key.c | 4 | ||||
| -rw-r--r-- | tmux.1 | 10 |
2 files changed, 8 insertions, 6 deletions
@@ -1,4 +1,4 @@ -/* $Id: mode-key.c,v 1.36 2009-12-04 22:14:47 tcunha Exp $ */ +/* $Id: mode-key.c,v 1.37 2010-01-25 17:11:42 tcunha 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 }, @@ -1,4 +1,4 @@ -.\" $Id: tmux.1,v 1.222 2010-01-22 17:28:34 tcunha Exp $ +.\" $Id: tmux.1,v 1.223 2010-01-25 17:11:42 tcunha 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" |