From: Chet Ramey <chet.ramey@case.edu>
Date: Wed, 23 Nov 2011 00:59:52 +0000 (-0500)
Subject: Bash-4.2 patch 2
X-Git-Tag: bash-4.3~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=23c597e509782b3166b527b89664676bda7448b7;p=thirdparty%2Fbash.git

Bash-4.2 patch 2
---

diff --git a/lib/readline/callback.c b/lib/readline/callback.c
index 4ee636108..7682cd07b 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 41e1dbb96..a3c35786c 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 2c576f58a..9355623db 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_ */