LineageOS/android_external_bash
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

readline multi-key command re-read input fix

Browse Source
This commit is contained in:
Chet Ramey
2018-06-01 10:22:00 -04:00
parent 36f89ff1d8
commit 34dbca51a5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/readline/readline.c
View File

@@ -1057,7 +1057,7 @@ _rl_subseq_result (r, map, key, got_subseq)
/* We probably shadowed a keymap, so keep going. */ /* We probably shadowed a keymap, so keep going. */
r = _rl_dispatch (ANYOTHERKEY, m); 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 /* We didn't match (r is probably -1), so return something to
tell the caller that it should try ANYOTHERKEY for an 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; _rl_dispatching_keymap = map;
return -2; return -2;
} }
else if (r && got_subseq) else if (r < 0 && got_subseq) /* XXX */
{ {
/* OK, back up the chain. */ /* OK, back up the chain. */
if (RL_ISSTATE (RL_STATE_MACROINPUT)) if (RL_ISSTATE (RL_STATE_MACROINPUT))

2
patchlevel.h
View File

@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */ looks for to find the patch level (for the sccs version string). */
#define PATCHLEVEL 21 #define PATCHLEVEL 22
#endif /* _PATCHLEVEL_H_ */ #endif /* _PATCHLEVEL_H_ */