summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2009-10-04 11:18:27 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2009-10-04 11:18:27 +0000
commitba717be9f2ecf9a75749d89954e7a77cbe2541aa (patch)
treed5e69fa0c4deecc1fd6e9a6b1a4cd52d7cc02a2f
parent16de74a6e8d81c600d3ac4d1728534073077b2ec (diff)
Get / and ? the right way round in vi mode, and use : for goto line rather than
g.
-rw-r--r--usr.bin/tmux/mode-key.c8
-rw-r--r--usr.bin/tmux/tmux.14
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/tmux/mode-key.c b/usr.bin/tmux/mode-key.c
index dbe3f7f3387..c4e431d4753 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.19 2009/10/04 08:26:41 nicm Exp $ */
+/* $OpenBSD: mode-key.c,v 1.20 2009/10/04 11:18:26 nicm Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -155,9 +155,10 @@ struct mode_key_tree mode_key_tree_vi_choice;
const struct mode_key_entry mode_key_vi_copy[] = {
{ ' ', 0, MODEKEYCOPY_STARTSELECTION },
{ '$', 0, MODEKEYCOPY_ENDOFLINE },
- { '/', 0, MODEKEYCOPY_SEARCHUP },
+ { '/', 0, MODEKEYCOPY_SEARCHDOWN },
{ '0', 0, MODEKEYCOPY_STARTOFLINE },
- { '?', 0, MODEKEYCOPY_SEARCHDOWN },
+ { ':', 0, MODEKEYCOPY_GOTOLINE },
+ { '?', 0, MODEKEYCOPY_SEARCHUP },
{ '\002' /* C-b */, 0, MODEKEYCOPY_PREVIOUSPAGE },
{ '\003' /* C-c */, 0, MODEKEYCOPY_CANCEL },
{ '\004' /* C-d */, 0, MODEKEYCOPY_HALFPAGEDOWN },
@@ -168,7 +169,6 @@ const struct mode_key_entry mode_key_vi_copy[] = {
{ '\r', 0, MODEKEYCOPY_COPYSELECTION },
{ '^', 0, MODEKEYCOPY_BACKTOINDENTATION },
{ 'b', 0, MODEKEYCOPY_PREVIOUSWORD },
- { 'g', 0, MODEKEYCOPY_GOTOLINE },
{ 'h', 0, MODEKEYCOPY_LEFT },
{ 'j', 0, MODEKEYCOPY_DOWN },
{ 'k', 0, MODEKEYCOPY_UP },
diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1
index d319b9ef6a3..1ebed6af528 100644
--- a/usr.bin/tmux/tmux.1
+++ b/usr.bin/tmux/tmux.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.93 2009/10/04 08:50:05 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.94 2009/10/04 11:18:26 nicm Exp $
.\"
.\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
.\"
@@ -508,7 +508,7 @@ The following keys are supported as appropriate for the mode:
.It Li "Delete entire line" Ta "d" Ta "C-u"
.It Li "Delete to end of line" Ta "D" Ta "C-k"
.It Li "End of line" Ta "$" Ta "C-e"
-.It Li "Goto line" Ta "g" Ta "g"
+.It Li "Goto line" Ta ":" Ta "g"
.It Li "Next page" Ta "C-f" Ta "Page down"
.It Li "Next word" Ta "w" Ta "M-f"
.It Li "Paste buffer" Ta "p" Ta "C-y"