X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/8dab4140dbf8338c4b8be75d4a663371c0b77aef..369836007a81062bf070ee45a4c6ce4d9231d89c:/vim-cmds.inc.pl

diff --git a/vim-cmds.inc.pl b/vim-cmds.inc.pl
index e627e07..013b455 100644
--- a/vim-cmds.inc.pl
+++ b/vim-cmds.inc.pl
@@ -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"],
@@ -378,7 +378,7 @@ v => {
 	'^['=> ["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",
 #
@@ -465,11 +490,11 @@ i => {
 	'^^' => ["toggle :lmap usag$sign{_}e", "co vim"],
 	'^[' => ["esc", "mo mode"],
 	'^]' => ["abbrev$sign{_}iate", "co vim"],
-	'^_' => ["change lang$sign{_}uage", "co vim"],
+	'^_' => ["toggle lang$sign{_}uage", "co vim"],
 	'^\\'=> ["switch mode", "mo arg"],
 
 	'^a' => ["insert prev$sign{_}ious", "co vim"],
-	'^b' => ["former i^_", "co"],
+	'^b' => ["former i^_", "no vim"],
 	'^c' => ["abort, no abbr", "mo mode"],
 	'^d' => ["un$sign{_}indent", "co"],
 	'^e' => ["ins char below", "co vim"],