X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/9aa3a0089bff9379b25186960929582f16e7b3f4..b3075ba5909f86e931ac0485984446df8661d9ab:/readline.inc.pl

diff --git a/readline.inc.pl b/readline.inc.pl
index 288885f..a2931e5 100644
--- a/readline.inc.pl
+++ b/readline.inc.pl
@@ -20,27 +20,35 @@ use utf8;
 	'+~' => '+&', # emacs
 	'^_' => ["undo", 'co'],
 
+	'+~' => ["user$sign{_}name exp$sign{_}and", 'mi ext'], # common emacs => '+&'
+	'+!' => ["cmd expand", 'mi ext'],
+	'+@' => ["host$sign{_}name exp$sign{_}and", 'mi ext'],
+	'+$' => ["variable expand", 'mi ext'],
+	'+^' => ["history expand", 'co ext'],
+	'+/' => ["filename expand", 'ci ext'],
+
 	'^a' => ["begin of line", 'pm'],
 	'^b' => ["char back$sign{_}w$sign{_}ard$sign{_}s", 'pm'],
 	'+b' => ["word back$sign{_}w$sign{_}ard$sign{_}s", 'pm'],
 	'+c' => ["capital$sign{_}ise word", 'mi'],
 	'^d' => ["delete char", 'mo'],
-	'+d' => ["delete word rem$sign{_}ain$sign{_}der", 'mo'],
+	'+d' => ["delete word rem$sign{_}ain$sign{_}der", 'mo ring'],
 #	'^e' => ["emacs mode", 'me'],
 	'^e' => ["end of line", 'pm'],
 	'^f' => ["char forward", 'pm'],
 	'+f' => ["word forward", 'pm'],
 	'^g' => ["abort cmd, bell", 'mv'],
 	'^h' => ["back$sign{_}space", 'mo'],
-	'^i' => ["complete", 'mi', '(tab)'],
+	'^i' => ["auto$sign{_}complet$sign{_}e", 'mi', '(tab)'],
 	'^j' => '^m',
 	'^+j'=> ["vim mode", 'me'],
-	'^k' => ["delete till eol", 'mo'],
+	'^k' => ["delete till eol", 'mo ring'],
 	'^l' => ["clear screen", 'ci'],
 	'+l' => ["lowcase word", 'mi'],
 	'^m' => ["enter line", 'co', '(enter)'],
 	'^n' => ["history next", 'co'],
 	'+n' => ["match history", 'co'],
+	'^o' => ["enter and next", 'co ext'],
 	'^p' => ["history back", 'co'],
 	'+p' => ["rev match history", 'co'],
 	'^q' => '^v', # Quote
@@ -49,14 +57,31 @@ use utf8;
 	'^s' => ["search history", 'co'],
 	'^t' => ["move char forw$sign{_}ard", 'mi', 'Transpose char'],
 	'+t' => ["move word forw$sign{_}ard", 'mi', 'Transpose word'],
-	'^u' => ["delete till bol", 'mo'], # unix
+	'^u' => ["delete till bol", 'mo ring'], # unix
 	'+u' => ["upcase word", 'mi'],
 	'^v' => ["verbatim char", 'mv'],
-	'^w' => ["delete word", 'mo'], # unix
-#	'^xBS' => ["delete till bol", 'mo'],
-	'^x' => ["extend$sign{_}ed", 'me arg'],
+	'^w' => ["delete word", 'mo ring'], # unix
+	'^x' => ["extend$sign{_}ed", 'me arg mode^x'],
 	'^y' => ["yank top", 'co'],
 	'+y' => ["rotate yank", 'co ring'],
 	'^+y'=> ["yank arg"],
 },
 
+'^x' => {
+	lead => $ascii ? "'x"  : "x̂",
+	desc => 'emacs ctrl-x bindings',
+
+	'^h' => '^u',
+	'('  => ["start macro", 'mv'],
+	')'  => ["end macro", 'mv'],
+	'e'  => ["run macro", 'mv', 'Execute'],
+	'^e' => ["editor", 'mi ext linkvim'],
+	'^r' => ["reload inputrc", 'mv'],
+	'^u' => '^_',
+	'^x' => ["swap cursor", 'pm', 'eXchange'],
+	'^g' => '^g',
+	'^h' => '^u',
+	'^v' => ["shell version", 'ci ext'],
+	'^?' => '^x^h',
+},
+