From: Chet Ramey Date: Fri, 1 Jun 2018 14:17:53 +0000 (-0400) Subject: readline-7.0 patch 5 X-Git-Tag: readline-8.0~1 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=57ea39840aebbb34571df1586acc66783b3368d0;p=thirdparty%2Freadline.git readline-7.0 patch 5 --- diff --git a/patchlevel b/patchlevel index 626a945..e0ba09d 100644 --- a/patchlevel +++ b/patchlevel @@ -1,3 +1,3 @@ # Do not edit -- exists only for use by patch -4 +5 diff --git a/readline.c b/readline.c index e51df4f..a05b35e 100644 --- a/readline.c +++ b/readline.c @@ -1057,7 +1057,7 @@ _rl_subseq_result (r, map, key, got_subseq) /* We probably shadowed a keymap, so keep going. */ r = _rl_dispatch (ANYOTHERKEY, m); } - else if (r && map[ANYOTHERKEY].function) + else if (r < 0 && map[ANYOTHERKEY].function) { /* We didn't match (r is probably -1), so return something to tell the caller that it should try ANYOTHERKEY for an @@ -1069,7 +1069,7 @@ _rl_subseq_result (r, map, key, got_subseq) _rl_dispatching_keymap = map; return -2; } - else if (r && got_subseq) + else if (r < 0 && got_subseq) /* XXX */ { /* OK, back up the chain. */ if (RL_ISSTATE (RL_STATE_MACROINPUT))