Readline-6.2 patch 1

diff --git a/callback.c b/callback.c
index 4ee636108ba6698c3c0491d3ffa6cbf07cf94a39..7682cd07b0e93c47bb84dc3c98f9cbccb4f664e3 100644 (file)
--- 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 41e1dbb964cbc479f9c28bae9471eae6d62f88d1..a3c35786c366940391f7f56fd690406c9a81c5e4 100644 (file)
--- 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 */