X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/69e936ab32b46f8c46e4dc077438cf4f4536aa9d..34c8b87c25c51521261ef20f49c34b924501890f:/readline.inc.pl

diff --git a/readline.inc.pl b/readline.inc.pl
index 22c3b8a..f617218 100644
--- a/readline.inc.pl
+++ b/readline.inc.pl
@@ -1,7 +1,7 @@
 use utf8;
 
 '' => {
-	desc => "normal mode",
+	desc => "emacs mode",
 
 	'+\\'=> ["delete whitesp$sign{_}ace", 'mo'],
 	'+_' => '+.',
@@ -15,32 +15,40 @@ use utf8;
 	'^?' => '^h',
 	'+?' => ["list complet$sign{_}ion$sign{_}s", 'ci'],
 	'+=' => '+?', # emacs
-	'^@' => ["set mark"],
+	'^@' => ["set mark", 'mv'],
 	'+&' => ["tilde expand", 'mi'],
 	'+~' => '+&', # 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"],
+	'^g' => ["abort cmd, bell", 'mv'],
 	'^h' => ["back$sign{_}space", 'mo'],
-	'^i' => ["complete", '', '(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", '', '(enter)'],
+	'^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,14 @@ 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"],
-	'^w' => ["delete word", 'mo'], # unix
+	'^v' => ["verbatim char", 'mv'],
+	'^w' => ["delete word", 'mo ring'], # unix
 #	'^xBS' => ["delete till bol", 'mo'],
 	'^x' => ["extend$sign{_}ed", 'me arg'],
-	'^y' => ["yank top"],
-	'+y' => ["rotate yank"],
+	'^y' => ["yank top", 'co'],
+	'+y' => ["rotate yank", 'co ring'],
 	'^+y'=> ["yank arg"],
 },