diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2014-11-05 21:08:54 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-06 11:39:41 +0000 |
| commit | 5ef447d243e5c4954e00d49a4c499dc3fd691725 (patch) | |
| tree | c53bf415572aa5a679fe06a2a2613f0844d31973 /meta/recipes-core | |
| parent | 52f9eebe86e4b641229b524dd7701c01d9ed833c (diff) | |
| download | openembedded-core-5ef447d243e5c4954e00d49a4c499dc3fd691725.tar.gz | |
readline: Patch for readline multikey dispatch issue
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-core/readline/readline_6.3.bb | 3 |
2 files changed, 34 insertions, 1 deletions
diff --git a/meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch b/meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch new file mode 100644 index 0000000000..54d1ac6eb9 --- /dev/null +++ b/meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch @@ -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 + diff --git a/meta/recipes-core/readline/readline_6.3.bb b/meta/recipes-core/readline/readline_6.3.bb index 2ae73ea945..03132db009 100644 --- a/meta/recipes-core/readline/readline_6.3.bb +++ b/meta/recipes-core/readline/readline_6.3.bb @@ -1,6 +1,7 @@ require readline.inc -SRC_URI_append = " file://readline63-003" +SRC_URI_append = " file://readline63-003 \ + file://readline-dispatch-multikey.patch" SRC_URI[archive.md5sum] = "33c8fb279e981274f485fd91da77e94a" SRC_URI[archive.sha256sum] = "56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" |