From e87c3b2927b3c931528dc00a5e2c598dd2e35ee1 Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Sat, 19 May 2018 22:33:26 +0200 Subject: [PATCH] vi: include keys for plugin unimpaired --- vi.eng.inc.pl | 106 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 96 insertions(+), 10 deletions(-) diff --git a/vi.eng.inc.pl b/vi.eng.inc.pl index a3146a6..ac7e3e2 100644 --- a/vi.eng.inc.pl +++ b/vi.eng.inc.pl @@ -138,7 +138,6 @@ key => { 'ga' => "char value\nGet Ascii value", 'g^a'=> "mem usage stats", - 'gc' => "(un)<>com<>ment\ncommentary or tComment plugin", 'gd' => "local declar<>ation", 'gD' => "global declar<>ation", 'ge' => "back to word end", @@ -155,8 +154,6 @@ key => { 'gj' => " screen", 'gJ' => "join leave spac<>ing", 'gk' => " screen", - 'gl' => "align to left\nlion plugin, also good for easy-align", - 'gL' => "align to right\nlion plugin", 'gm' => "cen<>ter screen", 'gn' => "select next find", 'gN' => "select prev find", @@ -245,7 +242,6 @@ key => { '[^i'=> "to first occur<>renc<>e", '[m' => "start of funct<>ion", '[p' => "P reind<>ent<>ed", - '[P' => "[p", '[s' => "last missp<>ell<>ing", '[S' => "last bad word", '[z' => "start of open fold", @@ -367,10 +363,7 @@ key => { 'vg?' => "rot13 encode", 'vg^a'=> "seq. incr<>ement", 'vg^g'=> "count region info", - 'vgc' => "(un)<>com<>ment\ncommentary or tComment plugin", 'vgJ' => "join literal<>ly", - 'vgl' => "align to left\nlion plugin, also good for easy-align", - 'vgL' => "align to right\nlion plugin", 'vgq' => "for<>mat", 'vgw' => "for<>mat still", 'vg^x'=> "seq. decr<>ement", @@ -434,7 +427,6 @@ key => { "i^g\e"=> "insert mode", 'i^gk' => " start col<>umn", 'i^gj' => " start col<>umn", - 'i^gs' => "sur<>round\nsurround plugin", 'i^gu' => "break undo seq<>uence", 'i^gU' => "keep undo seq<>uence", # other i^g keys (even esc) are not recognized @@ -455,6 +447,56 @@ key => { 'i^x^u' => "cus<>tom comp<>l<>et<>e", 'i^x^v' => "ex cmd compl<>et<>e", 'i^x^y' => "window down", + + # plugins + 'gc' => "(un)<>com<>ment\ncommentary or tComment plugin", + 'vgc' => "(un)<>com<>ment\ncommentary or tComment plugin", + 'gl' => "align to left\nlion plugin, also good for easy-align", + 'vgl' => "align to left\nlion plugin, also good for easy-align", + 'gL' => "align to right\nlion plugin", + 'vgL' => "align to right\nlion plugin", + 'i^gs' => "sur<>round\nsurround plugin", + + # unimpaired + '[a' => "prev<>ious file\nunimpaired map for :prev", + ']a' => "next file\nunimpaired map for :n", + '[A' => "first file\nunimpaired map for :rew", + ']A' => "last file\nunimpaired map for :la", + '[b' => "prev<>ious buffer\nunimpaired map for :bp", + ']b' => "next buffer\nunimpaired map for :bn", + '[B' => "first buffer\nunimpaired map for :br", + ']B' => "last buffer\nunimpaired map for :bl", + '[e' => "exchange line above\nunimpaired plugin", + ']e' => "exchange line belo<>w\nunimpaired plugin", + '[f' => "preced<>ing file alph<>abet<>ic<>al<>ly\nunimpaired plugin", + ']f' => "next file alph<>abet<>ic<>al<>ly\nunimpaired plugin", + '[l' => "previous loc<>at<>ion\nunimpaired map for :lp", + ']l' => "next loc<>ation\nunimpaired map for :lne", + '[L' => "first loc<>ation\nunimpaired map for :lr", + ']L' => "last loc<>ation\nunimpaired map for :lla", + '[^l'=> "next file in loc<>at<>ions\nunimpaired map for :lpf", + ']^l'=> "file back in loc<>at<>ions\nunimpaired map for :lnf", + '[n' => "previous conflict<>/hunk\nunimpaired plugin", + ']n' => "next confl<>ict<>/hunk\nunimpaired plugin", + '[o' => "enable option\nunimpaired plugin", + ']o' => "disable option\nunimpaired plugin", + 'yo' => "toggle option\nunimpaired plugin", + '[q' => "previous quickfix\nunimpaired map for :cp", + ']q' => "next quickfix error\nunimpaired map for :cn", + '[Q' => "first quickfix\nunimpaired map for :cr", + ']Q' => "last quickfix error\nunimpaired map for :cla", + '[^q'=> "quickfix file b<>ack\nunimpaired map for :cpf", + ']^q'=> "next file in q<>uick<>f<>ix\nunimpaired map for :cnf", + '[t' => "previous tag\nunimpaired map for :tp", + ']t' => "next tag\nunimpaired map for :tn", + '[T' => "first tag\nunimpaired map for :tr", + ']T' => "last tag\nunimpaired map for :tl", + '[u' => "url encode\nunimpaired plugin", + ']u' => "url decode\nunimpaired plugin", + '[x' => "xml encode\nunimpaired plugin", + ']x' => "xml decode\nunimpaired plugin", + '[y' => "escape c str<>ing\nunimpaired plugin", + ']y' => "unescap<>e c str<>ing\nunimpaired plugin", }, mode => { @@ -488,7 +530,7 @@ flag => { arg => ["key", "Commands with a dot need a char argument afterwards."], motion => ["key", "Requires a motion afterwards, operates between cursor and destination."], 'v6 new' => ["vim", "Not in original Vi (assessment incomplete)."], - 'xcommentary xlion xsurround ext' => ["plugin", "Optional features provided by common plugins."], + 'xcommentary xlion xsurround xunimpaired ext' => ["plugin", "Optional features provided by common plugins."], }, def => { @@ -766,10 +808,32 @@ def => { '^i'=> 'g3', 'm' => "g2", 'p' => "g4", - 'P' => "g4", + 'P' => "=[p", 's' => "g3 v7", 'S' => "g3 v7", 'z' => "g2 v6 folding", + + 'a' => "g3 xunimpaired", + 'A' => "g3 xunimpaired", + 'b' => "g3 xunimpaired", + 'B' => "g3 xunimpaired", + 'e' => "g4 xunimpaired", + 'l' => "g3 xunimpaired", + 'L' => "g3 xunimpaired", + '^l'=> "g3 xunimpaired", + '^l'=> "g3 xunimpaired", + 'f' => "g3 xunimpaired", # overrides native alias + 'n' => "g3 xunimpaired", + 'o' => "g9 arg xunimpaired", + 'q' => "g3 xunimpaired", + 'Q' => "g3 xunimpaired", + '^q'=> "g3 xunimpaired", + 't' => "g3 xunimpaired", + 'T' => "g3 xunimpaired", + 'u' => "g4 argm xunimpaired", + 'x' => "g4 argm xunimpaired", + 'y' => "g4 argm xunimpaired", + ' ' => "g4 xunimpaired", }, # mode [ ']' => { @@ -802,6 +866,28 @@ def => { 's' => "g3 v7", 'S' => "g3 v7", 'z' => "g2 v6 folding", + + 'a' => "g3 xunimpaired", + 'A' => "g3 xunimpaired", + 'b' => "g3 xunimpaired", + 'B' => "g3 xunimpaired", + 'e' => "g4 xunimpaired", + 'l' => "g3 xunimpaired", + 'L' => "g3 xunimpaired", + '^l'=> "g3 xunimpaired", + '^l'=> "g3 xunimpaired", + 'f' => "g3 xunimpaired", # overrides native alias + 'n' => "g3 xunimpaired", + 'o' => "g9 arg xunimpaired", + 'q' => "g3 xunimpaired", + 'Q' => "g3 xunimpaired", + '^q'=> "g3 xunimpaired", + 't' => "g3 xunimpaired", + 'T' => "g3 xunimpaired", + 'u' => "g4 argm xunimpaired", + 'x' => "g4 argm xunimpaired", + 'y' => "g4 argm xunimpaired", + ' ' => "g4 xunimpaired", }, # mode ] '^w' => { -- 2.30.0