From d0a9f21f36b2bf3ac28e1b11c1962bbb2ca0be2c Mon Sep 17 00:00:00 2001
From: Chet Ramey <chet.ramey@case.edu>
Date: Wed, 23 Nov 2011 19:29:04 -0500
Subject: Readline-6.2 patch 1

---
 callback.c | 3 +++
 vi_mode.c  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/callback.c b/callback.c
index 4ee6361..7682cd0 100644
--- a/callback.c
+++ b/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/vi_mode.c b/vi_mode.c
index 41e1dbb..a3c3578 100644
--- a/vi_mode.c
+++ b/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 */
-- 
cgit v1.2.1