X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/0ce39bba1bb84f703bb2ce69d4f98681c0dd602b..68625510fc0fbda4ecf4739929570d985631a063:/vim-cmds.inc.pl diff --git a/vim-cmds.inc.pl b/vim-cmds.inc.pl index 6ff4d30..bc171da 100644 --- a/vim-cmds.inc.pl +++ b/vim-cmds.inc.pl @@ -4,7 +4,7 @@ use utf8; desc => "normal mode", '~' => ["toggle case", "co undo"], - '!' => ["extern$sign{_}al filter", "co argm undo modec"], + '!' => ["extern$sign{_}al filt$sign{_}er", "co argm undo modec"], '@' => ["play macro", "co arg undo"], '#' => ["rev. find word", "pm vim"], '$' => ["eol", "pm"], @@ -29,7 +29,7 @@ use utf8; '\\' => ["not used", "me arg"], '^\\' => ["to mode/$sign{_}ext$sign{_}ens$sign{_}ion$sign{_}s", "mo arg"], ',' => ["reverse t/T/f/F", "pm"], - '<' => ["un­$sign{_}ind$sign{_}ent", "co argm undo"], + '<' => ["un$sign{_}ind$sign{_}ent", "co argm undo"], '.' => ["repeat cmd", "co undo"], '>' => ["ind$sign{_}ent", "co argm undo"], '/' => ["find", "pm arg modec"], @@ -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", @@ -92,7 +92,7 @@ use utf8; '^q'=> ["(xon)", "ci", 'Qome back'], # or ^v 'r' => ["replace char", "co arg undo"], 'R' => ["replace mode", "mi undo modei"], - '^r'=> ["redo", "co undo"], + '^r'=> ["redo", "co undo vim"], 's' => ["subst char", "mi undo modei"], 'S' => ["subst line", "mi undo modei"], '^s'=> ["(xoff)", "ci", 'Stop'], @@ -104,16 +104,16 @@ use utf8; '^u'=> ["scroll up", "po"], 'v' => ["visual mode", "mv modev"], 'V' => ["visual lines", "mv modev"], - '^v'=> ["visual block", "mv modev"], + '^v'=> ["visual block", "mv modev vim"], 'w' => ["next word", "pm"], 'W' => ['next word', "pm"], '^w'=> ["window cmds", "me arg mode^w"], 'x' => ["delete char", "co undo"], - 'X' => ["back­$sign{_}space", "co undo"], + 'X' => ["back$sign{_}space", "co undo"], '^x'=> ["subs$sign{_}tract", "co undo"], - 'y' => ["yank", "co argm"], + 'y' => ["yank", "co argm", '(copy)'], '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)'], @@ -157,7 +157,7 @@ g => { '^g'=> ["cursor pos info", "ci"], 'h' => ["select mode", "mv modev", "Get Highlighted"], 'H' => ["select lines", "mv modev", "Get Highlighted"], - '^h'=> ["select block", "mv modev", "Get Highlighted"], + '^h'=> ["select block", "mv modev vim", "Get Highlighted"], 'i' => ["insert at last pos", "mi undo modei"], 'I' => ["insert at soft bol", "mi undo modei"], 'j' => ["display line down", "pm vim"], @@ -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,9 +377,10 @@ 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 + 'A' => ["append to block", "mi modei vim"], # block 'c' => ["replace area", "mi modei vim"], 'C' => ["replace lines", "mi modei vim"], '^c'=> ["abort", "mo mode"], @@ -389,7 +390,7 @@ v => { '^g'=> ["select mode", "mv"], '^h'=> ["delete area", "co"], # select mode only 'i' => ["extend inner a$sign{_}r$sign{_}ea", "me modeva arg vim"], - 'I' => ["insert to block", "mi modei"], # block + 'I' => ["insert to block", "mi modei vim"], # block 'J' => ["join lines", "co"], 'K' => ["keyword$sign{_}prg", "co"], 'o' => ["to other corner", "pm"], @@ -407,7 +408,7 @@ v => { 'U' => ["upper$sign{_}case", "co vim"], 'v' => ["char$sign{_}wise", "mv"], 'V' => ["line$sign{_}wise", "mv"], - '^v'=> ["block$sign{_}wise", "mv"], + '^v'=> ["block$sign{_}wise", "mv vim"], 'x' => "vd", 'X' => "vD", 'y' => ["yank area", "co"], @@ -462,7 +463,7 @@ va => { # # '^_' => 'i^_', # '^^' => 'i^^', -## '^\\'=> ["cmd", "me arg"], +# '^\\'=>'^\\', # '^a' => ["complete", ""], #todo # '^b' => ["bol", "po"], # '^c' => 'i^c', @@ -490,20 +491,20 @@ i => { '^^' => ["toggle :lmap usag$sign{_}e", "co vim"], '^[' => ["esc", "mo mode"], '^]' => ["abbrev$sign{_}iate", "co vim"], - '^_' => ["change lang$sign{_}uage", "co vim"], - '^\\'=> ["switch mode", "mo arg"], + '^_' => ["toggle lang$sign{_}uage", "co vim"], + '^\\'=>'^\\', '^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"], '^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"], - '^k' => ["di$sign{_}graph", "co arg arg vim", "Key code"], + '^k' => ["di$sign{_}graph", "co arg arg vim linkdigraphs.plp", "Key code"], '^l' => ["im leave ins mode", "mo mode vim"], # insertmode only '^m' => ["enter", "co"], '^n' => ["find next keyword", "pm vim"], @@ -521,11 +522,21 @@ i => { '^z' => [":sus$sign{_}pend in im", "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"],