Bash-4.2 patch 2

This commit is contained in:
Chet Ramey 2011-11-22 19:59:52 -05:00
commit 23c597e509
3 changed files with 5 additions and 2 deletions

View file

@ -148,6 +148,9 @@ rl_callback_read_char ()
eof = _rl_vi_domove_callback (_rl_vimvcxt); eof = _rl_vi_domove_callback (_rl_vimvcxt);
/* Should handle everything, including cleanup, numeric arguments, /* Should handle everything, including cleanup, numeric arguments,
and turning off RL_STATE_VIMOTION */ and turning off RL_STATE_VIMOTION */
if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0)
_rl_internal_char_cleanup ();
return; return;
} }
#endif #endif

View file

@ -1114,7 +1114,7 @@ rl_domove_read_callback (m)
rl_beg_of_line (1, c); rl_beg_of_line (1, c);
_rl_vi_last_motion = c; _rl_vi_last_motion = c;
RL_UNSETSTATE (RL_STATE_VIMOTION); RL_UNSETSTATE (RL_STATE_VIMOTION);
return (0); return (vidomove_dispatch (m));
} }
#if defined (READLINE_CALLBACKS) #if defined (READLINE_CALLBACKS)
/* XXX - these need to handle rl_universal_argument bindings */ /* XXX - these need to handle rl_universal_argument bindings */

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 1 #define PATCHLEVEL 2
#endif /* _PATCHLEVEL_H_ */ #endif /* _PATCHLEVEL_H_ */