Support "jump to" like vi in copy mode using t and T keys. Also add x

and X for delete in edit mode.

From Ben Boeckel, thanks.

1 files changed, 8 insertions, 0 deletions

diff --git a/mode-key.c b/mode-key.c
index 95b4c232..de5664c7 100644
--- a/mode-key.c
+++ b/mode-key.c
@@ -98,6 +98,8 @@ const struct mode_key_cmdstr mode_key_cmdstr_copy[] = {
 	{ MODEKEYCOPY_JUMPAGAIN, "jump-again" },
 	{ MODEKEYCOPY_JUMPREVERSE, "jump-reverse" },
 	{ MODEKEYCOPY_JUMPBACK, "jump-backward" },
+	{ MODEKEYCOPY_JUMPTO, "jump-to-forward" },
+	{ MODEKEYCOPY_JUMPTOBACK, "jump-to-backward" },
 	{ MODEKEYCOPY_LEFT, "cursor-left" },
 	{ MODEKEYCOPY_RECTANGLETOGGLE, "rectangle-toggle" },
 	{ MODEKEYCOPY_MIDDLELINE, "middle-line" },
@@ -147,6 +149,7 @@ const struct mode_key_entry mode_key_vi_edit[] = {
 	{ '$',			1, MODEKEYEDIT_ENDOFLINE },
 	{ '0',			1, MODEKEYEDIT_STARTOFLINE },
 	{ 'D',			1, MODEKEYEDIT_DELETETOENDOFLINE },
+	{ 'X',			1, MODEKEYEDIT_BACKSPACE },
 	{ '\003' /* C-c */,	1, MODEKEYEDIT_CANCEL },
 	{ '\010' /* C-h */, 	1, MODEKEYEDIT_BACKSPACE },
 	{ '\r',			1, MODEKEYEDIT_ENTER },
@@ -162,6 +165,7 @@ const struct mode_key_entry mode_key_vi_edit[] = {
 	{ 'l',			1, MODEKEYEDIT_CURSORRIGHT },
 	{ 'p',			1, MODEKEYEDIT_PASTE },
 	{ 'w',			1, MODEKEYEDIT_NEXTWORD },
+	{ 'x',			1, MODEKEYEDIT_DELETE },
 	{ KEYC_BSPACE,		1, MODEKEYEDIT_BACKSPACE },
 	{ KEYC_DC,		1, MODEKEYEDIT_DELETE },
 	{ KEYC_DOWN,		1, MODEKEYEDIT_HISTORYDOWN },
@@ -225,6 +229,7 @@ const struct mode_key_entry mode_key_vi_copy[] = {
 	{ 'L',			0, MODEKEYCOPY_BOTTOMLINE },
 	{ 'M',			0, MODEKEYCOPY_MIDDLELINE },
 	{ 'N',			0, MODEKEYCOPY_SEARCHREVERSE },
+	{ 'T',			0, MODEKEYCOPY_JUMPTOBACK },
 	{ 'W',			0, MODEKEYCOPY_NEXTSPACE },
 	{ '\002' /* C-b */,	0, MODEKEYCOPY_PREVIOUSPAGE },
 	{ '\003' /* C-c */,	0, MODEKEYCOPY_CANCEL },
@@ -246,6 +251,7 @@ const struct mode_key_entry mode_key_vi_copy[] = {
 	{ 'k',			0, MODEKEYCOPY_UP },
 	{ 'l',			0, MODEKEYCOPY_RIGHT },
 	{ 'n',			0, MODEKEYCOPY_SEARCHAGAIN },
+	{ 't',			0, MODEKEYCOPY_JUMPTO },
 	{ 'q',			0, MODEKEYCOPY_CANCEL },
 	{ 'v',			0, MODEKEYCOPY_RECTANGLETOGGLE },
 	{ 'w',			0, MODEKEYCOPY_NEXTWORD },
@@ -339,6 +345,7 @@ const struct mode_key_entry mode_key_emacs_copy[] = {
 	{ 'N',			0, MODEKEYCOPY_SEARCHREVERSE },
 	{ 'R' | KEYC_ESCAPE,	0, MODEKEYCOPY_TOPLINE },
 	{ 'R',			0, MODEKEYCOPY_RECTANGLETOGGLE },
+	{ 'T',			0, MODEKEYCOPY_JUMPTOBACK },
 	{ '\000' /* C-Space */,	0, MODEKEYCOPY_STARTSELECTION },
 	{ '\001' /* C-a */,	0, MODEKEYCOPY_STARTOFLINE },
 	{ '\002' /* C-b */,	0, MODEKEYCOPY_LEFT },
@@ -363,6 +370,7 @@ const struct mode_key_entry mode_key_emacs_copy[] = {
 	{ 'n',			0, MODEKEYCOPY_SEARCHAGAIN },
 	{ 'q',			0, MODEKEYCOPY_CANCEL },
 	{ 'r' | KEYC_ESCAPE,	0, MODEKEYCOPY_MIDDLELINE },
+	{ 't',			0, MODEKEYCOPY_JUMPTO },
 	{ 'v' | KEYC_ESCAPE,	0, MODEKEYCOPY_PREVIOUSPAGE },
 	{ 'w' | KEYC_ESCAPE,	0, MODEKEYCOPY_COPYSELECTION },
 	{ KEYC_DOWN | KEYC_CTRL,0, MODEKEYCOPY_SCROLLDOWN },