readline: mark readline v2.1 additions

diff --git a/readline.inc.pl b/readline.inc.pl
index a2931e553451eaf3b95f3585cd9878a490c773fb..526fdbd8ca8f308a8bd0e2f12993d5f277e4b479 100644 (file)
--- a/readline.inc.pl
+++ b/readline.inc.pl
@@ -3,22 +3,26 @@ use utf8;
 '' => {
        desc => "emacs mode",
 
-       '+\\'=> ["delete whitesp$sign{_}ace", 'mo'],
-       '+_' => '+.',
-       '+>' => ["history end", 'co'],
        '+<' => ["history start", 'co'],
-       '+.' => ["insert last", 'co'],
-       '+#' => ["prefix comm$sign{_}en$sign{_}t", 'mi'],
-       '+*' => ["complet$sign{_}e all", 'mi'],
-       '^]' => ["find char", 'pm arg'],
-       '^+]'=> ["rev find char", 'pm arg'],
+       '+=' => '+?', #TODO: new # emacs, not in v2.0
+       '+>' => ["history end", 'co'],
        '^?' => '^h',
        '+?' => ["list complet$sign{_}ion$sign{_}s", 'ci'],
-       '+=' => '+?', # emacs
-       '^@' => ["set mark", 'mv'],
+       '^@' => ["set mark", 'mv new'], # not in v2.0
+
+       '+#' => ["prefix comm$sign{_}en$sign{_}t", 'mi new'], # not in v2.0
        '+&' => ["tilde expand", 'mi'],
+       '+*' => ["complet$sign{_}e all", 'mi new'], # not in v2.0
+       '+.' => ["insert last", 'co'],
        '+~' => '+&', # emacs
+
+       '^[' => ["meta", 'mv'],
+       '^+['=> '^i',
+       '+\\'=> ["delete whitesp$sign{_}ace", 'mo'],
+       '^]' => ["find char", 'pm arg new'], # not in v2.0
+       '^+]'=> ["rev find char", 'pm arg new'], # not in v2.0
        '^_' => ["undo", 'co'],
+       '+_' => '+.',
 
        '+~' => ["user$sign{_}name exp$sign{_}and", 'mi ext'], # common emacs => '+&'
        '+!' => ["cmd expand", 'mi ext'],
@@ -38,14 +42,18 @@ use utf8;
        '^f' => ["char forward", 'pm'],
        '+f' => ["word forward", 'pm'],
        '^g' => ["abort cmd, bell", 'mv'],
+       '^+g'=> '^g',
        '^h' => ["back$sign{_}space", 'mo'],
+       '^+h'=> ["delete bound word", 'mo ring'], #TODO
        '^i' => ["auto$sign{_}complet$sign{_}e", 'mi', '(tab)'],
+       '^+i'=> '^v^i',
        '^j' => '^m',
-       '^+j'=> ["vim mode", 'me'],
+       '^+j'=> ["vim mode", 'me'], #TODO: mode^+j
        '^k' => ["delete till eol", 'mo ring'],
        '^l' => ["clear screen", 'ci'],
        '+l' => ["lowcase word", 'mi'],
        '^m' => ["enter line", 'co', '(enter)'],
+       '^+m'=> '^+j',
        '^n' => ["history next", 'co'],
        '+n' => ["match history", 'co'],
        '^o' => ["enter and next", 'co ext'],
@@ -54,6 +62,7 @@ use utf8;
        '^q' => '^v', # Quote
        '^r' => ["reverse history", 'co'],
        '+r' => ["full undo", 'co', 'Revert'],
+       '^+r'=> '+r',
        '^s' => ["search history", 'co'],
        '^t' => ["move char forw$sign{_}ard", 'mi', 'Transpose char'],
        '+t' => ["move word forw$sign{_}ard", 'mi', 'Transpose word'],
@@ -71,16 +80,15 @@ use utf8;
        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',
+       '^r' => ["reload inputrc", 'mv'],
+       '^u' => '^_',
+       '^x' => ["swap cursor", 'pm new', 'eXchange'], # not in v2.0
        '^v' => ["shell version", 'ci ext'],
        '^?' => '^x^h',
 },

diff --git a/readline.plp b/readline.plp
index c849921fcfd47413565ccab9264288b854888ecf..06c8e30fb98a291c49728e2f19fddcf18f68fcf6 100644 (file)
--- a/readline.plp
+++ b/readline.plp
@@ -82,8 +82,10 @@ $keys->print_rows($get{rows} || '^x=213', [4,3,2]);
                <dl class="legend legend-options">
                <dt>key<:= $sign{arg} :>
                        <dd>Commands with a dot need a char argument afterwards.
+               <dt class="new">&gt;v2.0
+                       <dd>Unavailable before readline version 2.1 (1997).
                <dt class="ext">bash
-                       <dd>Default assignment in Bash shells, but not common readline
+                       <dd>Default assignment in Bash shells, but not common readline.
                </dl>
 
                <ul class="legend legend-set">