X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/8da111b671c9914450077a1ec506964e70dceb40..0ce39bba1bb84f703bb2ce69d4f98681c0dd602b:/vim-cmds.inc.pl

diff --git a/vim-cmds.inc.pl b/vim-cmds.inc.pl
index bc05a94..6ff4d30 100644
--- a/vim-cmds.inc.pl
+++ b/vim-cmds.inc.pl
@@ -22,16 +22,16 @@ use utf8;
 	'-' => ["prev line", "pm"],
 	'=' => ["auto form$sign{_}at", "co argm undo"],
 	'?' => ["find rev.", "pm arg modec"],
-	';' => ["repeat t/T/f/F", "pm"],
+	';' => ["repeat t/f/T/F", "pm"],
 	':' => ["ex cmd line", "co modec"],
 	"'" => ["goto mark bol", "pm arg"],
 	'"' => ["use register", "co arg"],
 	'\\' => ["not used", "me arg"],
 	'^\\' => ["to mode/$sign{_}ext$sign{_}ens$sign{_}ion$sign{_}s", "mo arg"],
 	',' => ["reverse t/T/f/F", "pm"],
-	'<' => ["un­$sign{_}indent", "co argm undo"],
+	'<' => ["un­$sign{_}ind$sign{_}ent", "co argm undo"],
 	'.' => ["repeat cmd", "co undo"],
-	'>' => ["ident", "co argm undo"],
+	'>' => ["ind$sign{_}ent", "co argm undo"],
 	'/' => ["find", "pm arg modec"],
 	'[' => ["move back$sign{_}ward$sign{_}s", "me arg mode["],
 	'{' => ["begin parag.", "pm"],
@@ -46,7 +46,7 @@ use utf8;
 	'b' => ["prev word", "pm", "Back"],
 	'B' => ['prev <span style="font-variant:small-caps">word</span>', "pm"],
 	'^b'=> ["page up", "pm"],
-	'c' => ["change", "mi argm undo modei"],
+	'c' => ["chan$sign{_}ge", "mi argm undo modei"],
 	'C' => ["change to eol", "mi undo modei"],
 	'^c'=> ["abort", "co"],
 	'd' => ["delete", "co argm undo"],
@@ -62,7 +62,7 @@ use utf8;
 	'G' => ["eof/$sign{_}goto ln", "pm"],
 	'^g'=> [":file (info)", "ci"],
 	'h' => [$sign{left}, "pm"],
-	'H' => ["screen top", "pm"],
+	'H' => ["screen top", "pm", 'Home row'],
 	'^h'=> "h",
 	'i' => ["insert mode", "mi undo modei"],
 	'I' => ["insert at bol", "mi undo modei"],
@@ -89,13 +89,13 @@ use utf8;
 	'^p'=> "k",
 	'q' => ["record macro", "mo arg", "Queue seQuence"],
 	'Q' => ["ex mode", "mo"],
-	'^q'=> ["(xon)", "ci"], # or ^v
+	'^q'=> ["(xon)", "ci", 'Qome back'], # or ^v
 	'r' => ["replace char", "co arg undo"],
 	'R' => ["replace mode", "mi undo modei"],
 	'^r'=> ["redo", "co undo"],
 	's' => ["subst char", "mi undo modei"],
 	'S' => ["subst line", "mi undo modei"],
-	'^s'=> ["(xoff)", "ci"],
+	'^s'=> ["(xoff)", "ci", 'Stop'],
 	't' => ["till char", "pm arg"],
 	'T' => ["back till char", "pm"],
 	'^t'=> ["previous tag", "po"],
@@ -116,7 +116,7 @@ use utf8;
 	'^y'=> ["window up", "po"],
 	'z' => ["extra cmds", "me arg modez"],
 	'Z' => ["quit", "me arg modeZ"],
-	'^z'=> [":sus$sign{_}pend", "ci"],
+	'^z'=> [":sus$sign{_}pend", "ci", 'zzz (as in sleep)'],
 }, # normal mode
 
 g => {
@@ -176,14 +176,14 @@ g => {
 	'T' => ["previous tab", "po vim7"],
 	'u' => ["lower$sign{_}case", "co argm vim"], # XXX undo?
 	'U' => ["upper$sign{_}case", "co undo argm vim"],
-	'v' => ["previous visual mode", "mv modev", "precedinG Visual"],
+	'v' => ["previous highl$sign{_}ight", 'mv modev', 'precedinG Visual'],
 	'V' => ["avoid reselect$sign{_}ion", "co"],
 	'w' => ["format remain cursor", "co argm vim7"],
 	'x' => ["Netrw$sign{_}BrowseX", "co vim7"],
 }, # mode g
 
 Z => {
-	desc => "additional commands (z)",
+	desc => "quit commands",
 	lead => "Z",
 
 	'^['=> ["esc", "mo mode"],
@@ -193,7 +193,7 @@ Z => {
 }, # mode Z
 
 z => {
-	desc => "quit commands",
+	desc => "additional commands (z)",
 	lead => "z",
 
 	'^' => ["page above", "po"],
@@ -372,13 +372,13 @@ v => {
 	'!' => ["external filter", "co"],
 	':' => ["cmd on range", "mo modec"],
 	'<' => ["un$sign{_}indent", "co"],
-	'=' => ["equalprg filter", "co"],
+	'=' => ["equal$sign{_}prg filt$sign{_}er", "co"],
 	'>' => ["indent", "co"],
 	'~' => ["toggle case", "co vim"],
 	'^['=> ["esc", "mo mode"],
 	'^]'=> ["jump to tag", "po"],
 
-	'a' => ["extend area", "me arg"], # XXX mode
+	'a' => ["extend area", "me modeva arg vim"],
 	'A' => ["append to block", "mi modei"], # block
 	'c' => ["replace area", "mi modei vim"],
 	'C' => ["replace lines", "mi modei vim"],
@@ -388,7 +388,7 @@ v => {
 	'g' => ["extra cmds", "me arg modevg"],
 	'^g'=> ["select mode", "mv"],
 	'^h'=> ["delete area", "co"], # select mode only
-	'i' => ["extend area", "me arg"],
+	'i' => ["extend inner a$sign{_}r$sign{_}ea", "me modeva arg vim"],
 	'I' => ["insert to block", "mi modei"], # block
 	'J' => ["join lines", "co"],
 	'K' => ["keyword$sign{_}prg", "co"],
@@ -428,10 +428,35 @@ vg => {
 	'?' => ["rot13 encode", "co vim"],
 	'J' => ["join leave spacing", "co vim"],
 	'q' => ["format", "co vim"],
-	'v' => ["previous highl$sign{_}ight", "co"],
+	'v' => 'gv',
 	'w' => ["format remain cursor", "co vim7"],
 }, # mode v g
 
+va => {
+	desc => 'text object selection (v a/i)',
+
+	'(' => 'vab',
+	')' => 'vab',
+	'`' => "va'",
+	"'" => ["quoted string", 'pm vim7'],
+	'"' => "va'",
+	'<' => ["<> block", 'pm vim'],
+	'>' => 'va<',
+	'[' => ["[] block", 'pm vim'],
+	'{' => 'vaB',
+	'^['=> ["esc", 'mv modev'],
+	']' => 'va[',
+	'}' => 'vaB',
+
+	'b' => ["() block", 'pm vim'],
+	'B' => ["{} Block", 'pm vim'],
+	'p' => ["para$sign{_}graph", 'pm vim'],
+	's' => ["senten$sign{_}ce", 'pm vim'],
+	't' => ["xml tag block", 'pm vim7'],
+	'w' => ["word", 'pm vim'],
+	'W' => ['<span style="font-variant:small-caps">word</span>', 'pm vim'],
+}, # mode v a
+
 #c => {
 #	desc => "command-line mode",
 #