Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From 8ef852a5be72c75e17f2510bea52455f809b56ce Mon Sep 17 00:00:00 2001 |
| 2 | From: Chet Ramey <chet.ramey@case.edu> |
| 3 | Date: Fri, 28 Mar 2014 14:07:42 -0400 |
| 4 | Subject: [PATCH 04/10] Readline-6.3 patch 2 |
| 5 | |
| 6 | Fixes multi-key issue identified in this thread: |
| 7 | http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00010.html |
| 8 | |
| 9 | Upstream-Status: Backport |
| 10 | |
| 11 | Signed-off-by: Saul Wold <sgw@linux.intel.com> |
| 12 | --- |
| 13 | readline.c | 3 ++- |
| 14 | 1 files changed, 2 insertions(+), 1 deletions(-) |
| 15 | |
| 16 | diff --git a/readline.c b/readline.c |
| 17 | index eb4eae3..abb29a0 100644 |
| 18 | --- a/readline.c |
| 19 | +++ b/readline.c |
| 20 | @@ -744,7 +744,8 @@ _rl_dispatch_callback (cxt) |
| 21 | r = _rl_subseq_result (r, cxt->oldmap, cxt->okey, (cxt->flags & KSEQ_SUBSEQ)); |
| 22 | |
| 23 | RL_CHECK_SIGNALS (); |
| 24 | - if (r == 0) /* success! */ |
| 25 | + /* We only treat values < 0 specially to simulate recursion. */ |
| 26 | + if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0)) /* success! or failure! */ |
| 27 | { |
| 28 | _rl_keyseq_chain_dispose (); |
| 29 | RL_UNSETSTATE (RL_STATE_MULTIKEY); |
| 30 | -- |
| 31 | 1.8.3.1 |
| 32 | |