[gentoo-commits] gentoo-x86 commit in sys-libs/readline/files: readline-6.3-dispatch-multikey.patch

[Mike Frysinger (vapier)]

vapier      14/03/28 19:04:47

  Modified:             readline-6.3-dispatch-multikey.patch
  Log:
  Update multikey patch from upstream #504440#8 by Martin von Gagern.
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

Revision  Changes    Path
1.2                  sys-libs/readline/files/readline-6.3-dispatch-multikey.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/readline/files/readline-6.3-dispatch-multikey.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/readline/files/readline-6.3-dispatch-multikey.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/readline/files/readline-6.3-dispatch-multikey.patch?r1=1.1&r2=1.2

Index: readline-6.3-dispatch-multikey.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/readline/files/readline-6.3-dispatch-multikey.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- readline-6.3-dispatch-multikey.patch	13 Mar 2014 09:21:33 -0000	1.1
+++ readline-6.3-dispatch-multikey.patch	28 Mar 2014 19:04:47 -0000	1.2
@@ -1,8 +1,9 @@
 https://bugs.gentoo.org/504440
-https://lists.gnu.org/archive/html/bug-readline/2014-03/msg00031.html
+v1: https://lists.gnu.org/archive/html/bug-readline/2014-03/msg00031.html
+v2: https://lists.gnu.org/archive/html/bug-readline/2014-03/msg00034.html
 
 *** ../bash-4.3/lib/readline/readline.c	2013-10-28 14:58:06.000000000 -0400
---- lib/readline/readline.c	2014-03-10 11:01:19.000000000 -0400
+--- lib/readline/readline.c	2014-03-10 14:15:02.000000000 -0400
 ***************
 *** 745,749 ****
   
@@ -10,9 +11,10 @@
 !   if (r == 0)			/* success! */
       {
         _rl_keyseq_chain_dispose ();
---- 745,749 ----
+--- 745,750 ----
   
     RL_CHECK_SIGNALS ();
-!   if (r == 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0))	/* success! or failure! */
+!   /* 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 ();