readline: Patch for readline multikey dispatch issue

(From OE-Core rev: d301ef7c2a5e857bd87be2a24251243ff181fa24)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold 2014-11-07 13:52:31 +00:00 committed by Richard Purdie
parent 7bd03ac241
commit 695d25452d
2 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,32 @@
From 8ef852a5be72c75e17f2510bea52455f809b56ce Mon Sep 17 00:00:00 2001
From: Chet Ramey <chet.ramey@case.edu>
Date: Fri, 28 Mar 2014 14:07:42 -0400
Subject: [PATCH 04/10] Readline-6.3 patch 2
Fixes multi-key issue identified in this thread:
http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00010.html
Upstream-Status: Backport
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
readline.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/readline.c b/readline.c
index eb4eae3..abb29a0 100644
--- 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);
--
1.8.3.1

View File

@ -1,6 +1,7 @@
require readline.inc
SRC_URI += "file://readline63-003"
SRC_URI += "file://readline63-003 \
file://readline-dispatch-multikey.patch"
SRC_URI[archive.md5sum] = "33c8fb279e981274f485fd91da77e94a"
SRC_URI[archive.sha256sum] = "56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43"