diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2011-11-22 19:59:52 -0500 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2011-11-22 19:59:52 -0500 |
| commit | 23c597e509782b3166b527b89664676bda7448b7 (patch) | |
| tree | aa1a2086fee6eac44d52c0b578327c370527d83c | |
| parent | 49ed961bb057ad481b8f22066d55526ecdfb3c09 (diff) | |
| download | bash-23c597e509782b3166b527b89664676bda7448b7.tar.gz | |
Bash-4.2 patch 2
| -rw-r--r-- | lib/readline/callback.c | 3 | ||||
| -rw-r--r-- | lib/readline/vi_mode.c | 2 | ||||
| -rw-r--r-- | patchlevel.h | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/lib/readline/callback.c b/lib/readline/callback.c index 4ee63610..7682cd07 100644 --- a/lib/readline/callback.c +++ b/lib/readline/callback.c @@ -148,6 +148,9 @@ rl_callback_read_char () eof = _rl_vi_domove_callback (_rl_vimvcxt); /* Should handle everything, including cleanup, numeric arguments, and turning off RL_STATE_VIMOTION */ + if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0) + _rl_internal_char_cleanup (); + return; } #endif diff --git a/lib/readline/vi_mode.c b/lib/readline/vi_mode.c index 41e1dbb9..a3c35786 100644 --- a/lib/readline/vi_mode.c +++ b/lib/readline/vi_mode.c @@ -1114,7 +1114,7 @@ rl_domove_read_callback (m) rl_beg_of_line (1, c); _rl_vi_last_motion = c; RL_UNSETSTATE (RL_STATE_VIMOTION); - return (0); + return (vidomove_dispatch (m)); } #if defined (READLINE_CALLBACKS) /* XXX - these need to handle rl_universal_argument bindings */ diff --git a/patchlevel.h b/patchlevel.h index 2c576f58..9355623d 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -25,6 +25,6 @@ regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh looks for to find the patch level (for the sccs version string). */ -#define PATCHLEVEL 1 +#define PATCHLEVEL 2 #endif /* _PATCHLEVEL_H_ */ |