Readline-6.3 patch 2

diff --git a/patchlevel b/patchlevel
index fdf474049fce8501d87e7b8fa7cf2b72cab0ad9b..7cbda82ded86fa174ee44dba637d5fa80815bfdc 100644 (file)
--- a/patchlevel
+++ b/patchlevel
@@ -1,3 +1,3 @@
 # Do not edit -- exists only for use by patch
 
-1
+2

diff --git a/readline.c b/readline.c
index eb4eae357b2b28106967520e1b1482bff90b84bd..abb29a02843563c4b46c24bf0f45210603d5fa99 100644 (file)
--- a/readline.c
+++ b/readline.c
@@ -744,7 +744,8 @@ _rl_dispatch_callback (cxt)
     r = _rl_subseq_result (r, cxt->oldmap, cxt->okey, (cxt->flags & KSEQ_SUBSEQ));
 
   RL_CHECK_SIGNALS ();
-  if (r == 0)                  /* success! */
+  /* We only treat values < 0 specially to simulate recursion. */
+  if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0))  /* success! or failure! */
     {
       _rl_keyseq_chain_dispose ();
       RL_UNSETSTATE (RL_STATE_MULTIKEY);