minor command key improvements; i^g mode

[sheet.git] / vim-cmds.inc.pl

diff --git a/vim-cmds.inc.pl b/vim-cmds.inc.pl
index 013b4559d83c0839212e7274f421ccc8bfaea937..a9f32c23c851e6033afc1082596a049618f4012d 100644 (file)
--- a/vim-cmds.inc.pl
+++ b/vim-cmds.inc.pl
@@ -66,7 +66,7 @@ use utf8;
        '^h'=> "h",
        'i' => ["insert mode", "mi undo modei"],
        'I' => ["insert at bol", "mi undo modei"],
-       '^i'=> ["jump to newer", "pm"],
+       '^i'=> ["jump to newer", "pm vim", 'Increase position'],
        'j' => [$sign{down}, "pm"],
        'J' => ["join lines", "co undo"],
        '^j'=> "j",
@@ -83,7 +83,7 @@ use utf8;
        '^n'=> "j",
        'o' => ["open below", "mi undo modei"],
        'O' => ["open above", "mi undo modei"],
-       '^o'=> ["jump to older", "pm"],
+       '^o'=> ["jump to older", "pm vim"],
        'p' => ["paste after", "co undo"],
        'P' => ["paste before", "co undo"],
        '^p'=> "k",
@@ -113,7 +113,7 @@ use utf8;
        '^x'=> ["subs$sign{_}tract", "co undo"],
        'y' => ["yank", "co argm"],
        'Y' => ["yank line", "co"],
-       '^y'=> ["window up", "po"],
+       '^y'=> ["window up", "po", 'Yield'],
        'z' => ["extra cmds", "me arg modez"],
        'Z' => ["quit", "me arg modeZ"],
        '^z'=> [":sus$sign{_}pend", "ci", 'zzz (as in sleep)'],
@@ -171,7 +171,7 @@ g => {
        'Q' => ["ex mode manual :", "mo vim"],
        'r' => ["replace char vir.", "co arg"],
        'R' => ["replace mode v$sign{_}ir$sign{_}t$sign{_}ual", "mi undo modei"],
-       's' => ["sleep", "ci", "Go to Sleep"],
+       's' => ["sleep", "ci vim", "Go to Sleep"],
        't' => ["next tab", "po vim7", "Goto Tab"],
        'T' => ["previous tab", "po vim7"],
        'u' => ["lower$sign{_}case", "co argm vim"], # XXX undo?
@@ -377,6 +377,7 @@ v => {
        '~' => ["toggle case", "co vim"],
        '^['=> ["esc", "mo mode"],
        '^]'=> ["jump to tag", "po"],
+       '^\\'=>'^\\',
 
        'a' => ["extend area", "me modeva arg vim"],
        'A' => ["append to block", "mi modei"], # block
@@ -462,7 +463,7 @@ va => {
 #
 #      '^_' => 'i^_',
 #      '^^' => 'i^^',
-##     '^\\'=> ["cmd", "me arg"],
+#      '^\\'=>'^\\',
 #      '^a' => ["complete", ""], #todo
 #      '^b' => ["bol", "po"],
 #      '^c' => 'i^c',
@@ -491,7 +492,7 @@ i => {
        '^[' => ["esc", "mo mode"],
        '^]' => ["abbrev$sign{_}iate", "co vim"],
        '^_' => ["toggle lang$sign{_}uage", "co vim"],
-       '^\\'=> ["switch mode", "mo arg"],
+       '^\\'=>'^\\',
 
        '^a' => ["insert prev$sign{_}ious", "co vim"],
        '^b' => ["former i^_", "no vim"],
@@ -499,7 +500,7 @@ i => {
        '^d' => ["un$sign{_}indent", "co"],
        '^e' => ["ins char below", "co vim"],
        '^f' => ["cinkeys: re-indent", "co"],
-       '^g' => ["start column", "pm arg"], #todo
+       '^g' => ["extra cmds", "me modei^g arg"],
        '^h' => ["back$sign{_}space", "co"],
        '^i' => ["tab", "co"],
        '^j' => ["enter", "co"],
@@ -521,11 +522,21 @@ i => {
        '^z' => [":sus$sign{_}pend in <em>im</em>", "ci vim"],  # insertmode only
 }, # modei
 
+'i^g' => {
+       desc => "extended insert commands (i ctrl-g)",
+       lead => $ascii ? "'g"  : "ĝ",
+
+       'k' => ["$sign{up} start col$sign{_}umn", 'pm'],
+       'j' => ["$sign{down} start col$sign{_}umn", 'pm'],
+       'u' => ["break undo seq$sign{_}uence", 'co'],
+       # other keys (even esc) are not recognized
+}, # mode i ^g
+
 'i^x' => {
        desc => "insert completion commands (i ctrl-x)",
        lead => $ascii ? "'x"  : "x̂",
 
-       '^[' => ["esc", "mo mode"],
+       '^[' => ["esc", "mo mode"], # yes, it really leaves insert mode
        '^]' => ["complet$sign{_}e tags", "co"],
        '^d' => ["complet$sign{_}e def$sign{_}ines", "co"],
        '^e' => ["window up", "po"],