X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/4e1baf7dd0bd8b9f632a5ca00377b5136c1890c8..cf5aaee63c5aa7eeae7e2e136e58e156841616a9:/vi.eng.inc.pl

diff --git a/vi.eng.inc.pl b/vi.eng.inc.pl
index 09a132d..ac7e3e2 100644
--- a/vi.eng.inc.pl
+++ b/vi.eng.inc.pl
@@ -242,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",
@@ -448,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 => {
@@ -481,6 +530,7 @@ flag => {
 	arg => ["key<arg>", "Commands with a dot need a char argument afterwards."],
 	motion => ["key<motion>", "Requires a motion afterwards, operates between cursor and destination."],
 	'v6 new' => ["vim", "Not in original Vi (assessment incomplete)."],
+	'xcommentary xlion xsurround xunimpaired ext' => ["plugin", "Optional features provided by common plugins."],
 },
 
 def => {
@@ -630,6 +680,7 @@ def => {
 
 		'a' => "g1",
 		'^a'=> "g1",
+		'c' => 'g4 argm xcommentary',
 		'd' => "g2 v6",
 		'D' => "g2 v6",
 		'e' => "g2",
@@ -646,6 +697,8 @@ def => {
 		'j' => "g2 v6",
 		'J' => "g4",
 		'k' => "g2 v6",
+		'l' => 'g3 argm arg xlion',
+		'L' => 'g3 argm arg xlion',
 		'm' => "g2 v6",
 		'n' => "g8 v7 modev",
 		'N' => "g8 v7 modev",
@@ -755,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 [
 
 	']' => {
@@ -791,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' => {
@@ -925,7 +1022,10 @@ def => {
 		'?' => "g4 v6",
 		'^a'=> 'g4 undo v8',
 		'^g' => "g1 vim6",
+		'c' => 'g4 xcommentary',
 		'J' => 'g4 v6',
+		'l' => 'g3 arg xlion',
+		'L' => 'g3 arg xlion',
 		'q' => "g4 v6",
 		'v' => "=gv",
 		'w' => 'g4 v7',
@@ -1028,6 +1128,7 @@ def => {
 
 		'k' => 'g2',
 		'j' => 'g2',
+		's' => 'g4 arg xsurround',
 		'u' => 'g4',
 		'U' => 'g4 v8',
 		# other keys (even esc) are not recognized