summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChet Ramey <chet.ramey@case.edu>2018-06-01 10:17:53 -0400
committerChet Ramey <chet.ramey@case.edu>2018-06-01 10:17:53 -0400
commit57ea39840aebbb34571df1586acc66783b3368d0 (patch)
tree932a06c2f5a00678b1ae1b9013272abcf7b8111f
parent457e4fbeb977ffe065dc2ba05a0ebc4000b32065 (diff)
downloadreadline-57ea39840aebbb34571df1586acc66783b3368d0.tar.gz
readline-7.0 patch 5
-rw-r--r--patchlevel2
-rw-r--r--readline.c4
2 files changed, 3 insertions, 3 deletions
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))