GNU readline-4.1

1 files changed, 123 insertions, 243 deletions

diff --git a/gnu/lib/libreadline/vi_mode.c b/gnu/lib/libreadline/vi_mode.c
index 89303644c59..be7f9496434 100644
--- a/gnu/lib/libreadline/vi_mode.c
+++ b/gnu/lib/libreadline/vi_mode.c
@@ -51,23 +51,37 @@
 
 /* Some standard library routines. */
 #include "rldefs.h"
-#include "rlmbutil.h"
-
 #include "readline.h"
 #include "history.h"
 
 #include "rlprivate.h"
 #include "xmalloc.h"
 
+#ifndef _rl_digit_p
+#define _rl_digit_p(c)  ((c) >= '0' && (c) <= '9')
+#endif
+
+#ifndef _rl_digit_value
+#define _rl_digit_value(c) ((c) - '0')
+#endif
+
 #ifndef member
 #define member(c, s) ((c) ? (char *)strchr ((s), (c)) != (char *)NULL : 0)
 #endif
 
+#ifndef isident
+#define isident(c) ((_rl_pure_alphabetic (c) || _rl_digit_p (c) || c == '_'))
+#endif
+
+#ifndef exchange
+#define exchange(x, y) do {int temp = x; x = y; y = temp;} while (0)
+#endif
+
 /* Non-zero means enter insertion mode. */
 static int _rl_vi_doing_insert;
 
 /* Command keys which do movement for xxx_to commands. */
-static const char *vi_motion = " hl^$0ftFT;,%wbeWBE|";
+static char *vi_motion = " hl^$0ftFt;,%wbeWBE|";
 
 /* Keymap used for vi replace characters.  Created dynamically since
    rarely used. */
@@ -87,11 +101,7 @@ static int _rl_vi_last_command = 'i';	/* default `.' puts you in insert mode */
 static int _rl_vi_last_repeat = 1;
 static int _rl_vi_last_arg_sign = 1;
 static int _rl_vi_last_motion;
-#if defined (HANDLE_MULTIBYTE)
-static char _rl_vi_last_search_mbchar[MB_LEN_MAX];
-#else
 static int _rl_vi_last_search_char;
-#endif
 static int _rl_vi_last_replacement;
 
 static int _rl_vi_last_key_before_insert;
@@ -99,14 +109,12 @@ static int _rl_vi_last_key_before_insert;
 static int vi_redoing;
 
 /* Text modification commands.  These are the `redoable' commands. */
-static const char *vi_textmod = "_*\\AaIiCcDdPpYyRrSsXx~";
+static char *vi_textmod = "_*\\AaIiCcDdPpYyRrSsXx~";
 
 /* Arrays for the saved marks. */
-static int vi_mark_chars['z' - 'a' + 1];
+static int vi_mark_chars[27];
 
-static void _rl_vi_stuff_insert PARAMS((int));
-static void _rl_vi_save_insert PARAMS((UNDO_LIST *));
-static int rl_digit_loop1 PARAMS((void));
+static int rl_digit_loop1 __P((void));
 
 void
 _rl_vi_initialize_line ()
@@ -160,15 +168,12 @@ int
 rl_vi_redo (count, c)
      int count, c;
 {
-  int r;
-
   if (!rl_explicit_arg)
     {
       rl_numeric_arg = _rl_vi_last_repeat;
       rl_arg_sign = _rl_vi_last_arg_sign;
     }
 
-  r = 0;
   vi_redoing = 1;
   /* If we're redoing an insert with `i', stuff in the inserted text
      and do not go into insertion mode. */
@@ -180,10 +185,10 @@ rl_vi_redo (count, c)
 	rl_point--;
     }
   else
-    r = _rl_dispatch (_rl_vi_last_command, _rl_keymap);
+    _rl_dispatch (_rl_vi_last_command, _rl_keymap);
   vi_redoing = 0;
 
-  return (r);
+  return (0);
 }
 
 /* A placeholder for further expansion. */
@@ -269,7 +274,7 @@ rl_vi_search (count, key)
       break;
 
     default:
-      rl_ding ();
+      ding ();
       break;
     }
   return (0);
@@ -325,7 +330,7 @@ rl_vi_prev_word (count, key)
 
   if (rl_point == 0)
     {
-      rl_ding ();
+      ding ();
       return (0);
     }
 
@@ -347,7 +352,7 @@ rl_vi_next_word (count, key)
 
   if (rl_point >= (rl_end - 1))
     {
-      rl_ding ();
+      ding ();
       return (0);
     }
 
@@ -365,7 +370,7 @@ rl_vi_end_word (count, key)
 {
   if (count < 0)
     {
-      rl_ding ();
+      ding ();
       return -1;
     }
 
@@ -455,14 +460,14 @@ rl_vi_fword (count, ignore)
   while (count-- && rl_point < (rl_end - 1))
     {
       /* Move to white space (really non-identifer). */
-      if (_rl_isident (rl_line_buffer[rl_point]))
+      if (isident (rl_line_buffer[rl_point]))
 	{
-	  while (_rl_isident (rl_line_buffer[rl_point]) && rl_point < rl_end)
+	  while (isident (rl_line_buffer[rl_point]) && rl_point < rl_end)
 	    rl_point++;
 	}
       else /* if (!whitespace (rl_line_buffer[rl_point])) */
 	{
-	  while (!_rl_isident (rl_line_buffer[rl_point]) &&
+	  while (!isident (rl_line_buffer[rl_point]) &&
 		 !whitespace (rl_line_buffer[rl_point]) && rl_point < rl_end)
 	    rl_point++;
 	}
@@ -492,9 +497,9 @@ rl_vi_bword (count, ignore)
 	 back so we don't get messed up by the rl_point++ down there in
 	 the while loop.  Without this code, words like `l;' screw up the
 	 function. */
-      last_is_ident = _rl_isident (rl_line_buffer[rl_point - 1]);
-      if ((_rl_isident (rl_line_buffer[rl_point]) && !last_is_ident) ||
-	  (!_rl_isident (rl_line_buffer[rl_point]) && last_is_ident))
+      last_is_ident = isident (rl_line_buffer[rl_point - 1]);
+      if ((isident (rl_line_buffer[rl_point]) && !last_is_ident) ||
+	  (!isident (rl_line_buffer[rl_point]) && last_is_ident))
 	rl_point--;
 
       while (rl_point > 0 && whitespace (rl_line_buffer[rl_point]))
@@ -502,10 +507,10 @@ rl_vi_bword (count, ignore)
 
       if (rl_point > 0)
 	{
-	  if (_rl_isident (rl_line_buffer[rl_point]))
-	    while (--rl_point >= 0 && _rl_isident (rl_line_buffer[rl_point]));
+	  if (isident (rl_line_buffer[rl_point]))
+	    while (--rl_point >= 0 && isident (rl_line_buffer[rl_point]));
 	  else
-	    while (--rl_point >= 0 && !_rl_isident (rl_line_buffer[rl_point]) &&
+	    while (--rl_point >= 0 && !isident (rl_line_buffer[rl_point]) &&
 		   !whitespace (rl_line_buffer[rl_point]));
 	  rl_point++;
 	}
@@ -527,10 +532,10 @@ rl_vi_eword (count, ignore)
 
       if (rl_point < rl_end)
 	{
-	  if (_rl_isident (rl_line_buffer[rl_point]))
-	    while (++rl_point < rl_end && _rl_isident (rl_line_buffer[rl_point]));
+	  if (isident (rl_line_buffer[rl_point]))
+	    while (++rl_point < rl_end && isident (rl_line_buffer[rl_point]));
 	  else
-	    while (++rl_point < rl_end && !_rl_isident (rl_line_buffer[rl_point])
+	    while (++rl_point < rl_end && !isident (rl_line_buffer[rl_point])
 		   && !whitespace (rl_line_buffer[rl_point]));
 	}
       rl_point--;
@@ -552,17 +557,7 @@ rl_vi_append_mode (count, key)
      int count, key;
 {
   if (rl_point < rl_end)
-    {
-      if (MB_CUR_MAX == 1 || rl_byte_oriented)
-	rl_point++;
-      else
-        {
-          int point = rl_point;
-          rl_forward_char (1, key);
-          if (point == rl_point)
-            rl_point = rl_end;
-        }
-    }
+    rl_point++;
   rl_vi_insertion_mode (1, key);
   return (0);
 }
@@ -616,7 +611,7 @@ _rl_vi_save_insert (up)
   if (len >= vi_insert_buffer_size)
     {
       vi_insert_buffer_size += (len + 32) - (len % 32);
-      vi_insert_buffer = (char *)xrealloc (vi_insert_buffer, vi_insert_buffer_size);
+      vi_insert_buffer = xrealloc (vi_insert_buffer, vi_insert_buffer_size);
     }
   strncpy (vi_insert_buffer, rl_line_buffer + start, len - 1);
   vi_insert_buffer[len-1] = '\0';
@@ -627,7 +622,6 @@ _rl_vi_done_inserting ()
 {
   if (_rl_vi_doing_insert)
     {
-      /* The `C', `s', and `S' commands set this. */
       rl_end_undo_group ();
       /* Now, the text between rl_undo_list->next->start and
 	 rl_undo_list->next->end is what was inserted while in insert
@@ -656,7 +650,7 @@ rl_vi_movement_mode (count, key)
      int count, key;
 {
   if (rl_point > 0)
-    rl_backward_char (1, key);
+    rl_backward (1, key);
 
   _rl_keymap = vi_movement_keymap;
   _rl_vi_done_inserting ();
@@ -673,54 +667,6 @@ rl_vi_arg_digit (count, c)
     return (rl_digit_argument (count, c));
 }
 
-/* Change the case of the next COUNT characters. */
-#if defined (HANDLE_MULTIBYTE)
-static int
-_rl_vi_change_mbchar_case (count)
-     int count;
-{
-  wchar_t wc;
-  char mb[MB_LEN_MAX+1];
-  int mblen;
-  mbstate_t ps;
-
-  memset (&ps, 0, sizeof (mbstate_t));
-  if (_rl_adjust_point (rl_line_buffer, rl_point, &ps) > 0)
-    count--;
-  while (count-- && rl_point < rl_end)
-    {
-      mbrtowc (&wc, rl_line_buffer + rl_point, rl_end - rl_point, &ps);
-      if (iswupper (wc))
-	wc = towlower (wc);
-      else if (iswlower (wc))
-	wc = towupper (wc);
-      else
-	{
-	  /* Just skip over chars neither upper nor lower case */
-	  rl_forward_char (1, 0);
-	  continue;
-	}
-
-      /* Vi is kind of strange here. */
-      if (wc)
-	{
-	  mblen = wctomb (mb, wc);
-	  if (mblen >= 0)
-	    mb[mblen] = '\0';
-	  rl_begin_undo_group ();
-	  rl_delete (1, 0);
-	  rl_insert_text (mb);
-	  rl_end_undo_group ();
-	  rl_vi_check ();
-	}
-      else
-        rl_forward_char (1, 0);
-    }
-
-  return 0;
-}
-#endif
-
 int
 rl_vi_change_case (count, ignore)
      int count, ignore;
@@ -731,11 +677,6 @@ rl_vi_change_case (count, ignore)
   if (rl_point >= rl_end)
     return (0);
 
-#if defined (HANDLE_MULTIBYTE)
-  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-    return (_rl_vi_change_mbchar_case (count));
-#endif
-
   while (count-- && rl_point < rl_end)
     {
       if (_rl_uppercase_p (rl_line_buffer[rl_point]))
@@ -745,7 +686,7 @@ rl_vi_change_case (count, ignore)
       else
 	{
 	  /* Just skip over characters neither upper nor lower case. */
-	  rl_forward_char (1, c);
+	  rl_forward (1, c);
 	  continue;
 	}
 
@@ -754,12 +695,12 @@ rl_vi_change_case (count, ignore)
 	{
 	  rl_begin_undo_group ();
 	  rl_delete (1, c);
-	  _rl_insert_char (1, c);
+	  rl_insert (1, c);
 	  rl_end_undo_group ();
 	  rl_vi_check ();
         }
       else
-	rl_forward_char (1, c);
+	rl_forward (1, c);
     }
   return (0);
 }
@@ -769,10 +710,10 @@ rl_vi_put (count, key)
      int count, key;
 {
   if (!_rl_uppercase_p (key) && (rl_point + 1 <= rl_end))
-    rl_point = _rl_find_next_mbchar (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO);
+    rl_point++;
 
   rl_yank (1, key);
-  rl_backward_char (1, key);
+  rl_backward (1, key);
   return (0);
 }
 
@@ -780,12 +721,7 @@ int
 rl_vi_check ()
 {
   if (rl_point && rl_point == rl_end)
-    {
-      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-	rl_point = _rl_find_prev_mbchar (rl_line_buffer, rl_point, MB_FIND_NONZERO);
-      else
-        rl_point--;
-    }
+    rl_point--;
   return (0);
 }
 
@@ -808,9 +744,7 @@ rl_vi_domove (key, nextkey)
   int old_end;
 
   rl_mark = rl_point;
-  RL_SETSTATE(RL_STATE_MOREINPUT);
   c = rl_read_key ();
-  RL_UNSETSTATE(RL_STATE_MOREINPUT);
   *nextkey = c;
 
   if (!member (c, vi_motion))
@@ -821,9 +755,7 @@ rl_vi_domove (key, nextkey)
 	  rl_numeric_arg = _rl_digit_value (c);
 	  rl_digit_loop1 ();
 	  rl_numeric_arg *= save;
-	  RL_SETSTATE(RL_STATE_MOREINPUT);
 	  c = rl_read_key ();	/* real command */
-	  RL_UNSETSTATE(RL_STATE_MOREINPUT);
 	  *nextkey = c;
 	}
       else if (key == c && (key == 'd' || key == 'y' || key == 'c'))
@@ -887,36 +819,24 @@ rl_vi_domove (key, nextkey)
     }
 
   if (rl_mark < rl_point)
-    SWAP (rl_point, rl_mark);
+    exchange (rl_point, rl_mark);
 
   return (0);
 }
 
 /* A simplified loop for vi. Don't dispatch key at end.
-   Don't recognize minus sign?
-   Should this do rl_save_prompt/rl_restore_prompt? */
+   Don't recognize minus sign? */
 static int
 rl_digit_loop1 ()
 {
   int key, c;
 
-  RL_SETSTATE(RL_STATE_NUMERICARG);
   while (1)
     {
-      if (rl_numeric_arg > 1000000)
-	{
-	  rl_explicit_arg = rl_numeric_arg = 0;
-	  rl_ding ();
-	  rl_clear_message ();
-	  RL_UNSETSTATE(RL_STATE_NUMERICARG);
-	  return 1;
-	}
-      rl_message ("(arg: %d) ", rl_arg_sign * rl_numeric_arg);
-      RL_SETSTATE(RL_STATE_MOREINPUT);
+      rl_message ("(arg: %d) ", rl_arg_sign * rl_numeric_arg, 0);
       key = c = rl_read_key ();
-      RL_UNSETSTATE(RL_STATE_MOREINPUT);
 
-      if (c >= 0 && _rl_keymap[c].type == ISFUNC &&
+      if (_rl_keymap[c].type == ISFUNC &&
 	  _rl_keymap[c].function == rl_universal_argument)
 	{
 	  rl_numeric_arg *= 4;
@@ -939,8 +859,6 @@ rl_digit_loop1 ()
 	  break;
 	}
     }
-
-  RL_UNSETSTATE(RL_STATE_NUMERICARG);
   return (0);
 }
 
@@ -957,7 +875,7 @@ rl_vi_delete_to (count, key)
 
   if (rl_vi_domove (key, &c))
     {
-      rl_ding ();
+      ding ();
       return -1;
     }
 
@@ -985,7 +903,7 @@ rl_vi_change_to (count, key)
 
   if (rl_vi_domove (key, &c))
     {
-      rl_ding ();
+      ding ();
       return -1;
     }
 
@@ -1035,7 +953,7 @@ rl_vi_yank_to (count, key)
 
   if (rl_vi_domove (key, &c))
     {
-      rl_ding ();
+      ding ();
       return -1;
     }
 
@@ -1061,14 +979,11 @@ rl_vi_delete (count, key)
 
   if (rl_end == 0)
     {
-      rl_ding ();
+      ding ();
       return -1;
     }
 
-  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-    end = _rl_find_next_mbchar (rl_line_buffer, rl_point, count, MB_FIND_NONZERO);
-  else
-    end = rl_point + count;
+  end = rl_point + count;
 
   if (end >= rl_end)
     end = rl_end;
@@ -1076,7 +991,7 @@ rl_vi_delete (count, key)
   rl_kill_text (rl_point, end);
   
   if (rl_point > 0 && rl_point == rl_end)
-    rl_backward_char (1, key);
+    rl_backward (1, key);
   return (0);
 }
 
@@ -1101,12 +1016,7 @@ int
 rl_vi_char_search (count, key)
      int count, key;
 {
-#if defined (HANDLE_MULTIBYTE)
-  static char *target;
-  static int mb_len;
-#else
   static char target;
-#endif
   static int orig_dir, dir;
 
   if (key == ';' || key == ',')
@@ -1114,22 +1024,9 @@ rl_vi_char_search (count, key)
   else
     {
       if (vi_redoing)
-#if defined (HANDLE_MULTIBYTE)
-	target = _rl_vi_last_search_mbchar;
-#else
 	target = _rl_vi_last_search_char;
-#endif
       else
-	{
-#if defined (HANDLE_MULTIBYTE)
-	  mb_len = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
-	  target = _rl_vi_last_search_mbchar;
-#else
-	  RL_SETSTATE(RL_STATE_MOREINPUT);
-	  _rl_vi_last_search_char = target = rl_read_key ();
-	  RL_UNSETSTATE(RL_STATE_MOREINPUT);
-#endif
-	}
+	_rl_vi_last_search_char = target = (*rl_getc_function) (rl_instream);
 
       switch (key)
         {
@@ -1151,11 +1048,7 @@ rl_vi_char_search (count, key)
         }
     }
 
-#if defined (HANDLE_MULTIBYTE)
-   return (_rl_char_search_internal (count, dir, target, mb_len));
-#else
   return (_rl_char_search_internal (count, dir, target));
-#endif
 }
 
 /* Match brackets */
@@ -1163,30 +1056,19 @@ int
 rl_vi_match (ignore, key)
      int ignore, key;
 {
-  int count = 1, brack, pos, tmp, pre;
+  int count = 1, brack, pos;
 
   pos = rl_point;
   if ((brack = rl_vi_bracktype (rl_line_buffer[rl_point])) == 0)
     {
-      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-	{
-	  while ((brack = rl_vi_bracktype (rl_line_buffer[rl_point])) == 0)
-	    {
-	      pre = rl_point;
-	      rl_forward_char (1, key);
-	      if (pre == rl_point)
-	        break;
-	    }
-	}
-      else
-	while ((brack = rl_vi_bracktype (rl_line_buffer[rl_point])) == 0 &&
-		rl_point < rl_end - 1)
-	  rl_forward_char (1, key);
+      while ((brack = rl_vi_bracktype (rl_line_buffer[rl_point])) == 0 &&
+	     rl_point < rl_end - 1)
+	rl_forward (1, key);
 
       if (brack <= 0)
 	{
 	  rl_point = pos;
-	  rl_ding ();
+	  ding ();
 	  return -1;
 	}
     }
@@ -1197,16 +1079,7 @@ rl_vi_match (ignore, key)
     {
       while (count)
 	{
-	  tmp = pos;
-	  if (MB_CUR_MAX == 1 || rl_byte_oriented)
-	    pos--;
-	  else
-	    {
-	      pos = _rl_find_prev_mbchar (rl_line_buffer, pos, MB_FIND_ANY);
-	      if (tmp == pos)
-	        pos--;
-	    }
-	  if (pos >= 0)
+	  if (--pos >= 0)
 	    {
 	      int b = rl_vi_bracktype (rl_line_buffer[pos]);
 	      if (b == -brack)
@@ -1216,7 +1089,7 @@ rl_vi_match (ignore, key)
 	    }
 	  else
 	    {
-	      rl_ding ();
+	      ding ();
 	      return -1;
 	    }
 	}
@@ -1225,12 +1098,7 @@ rl_vi_match (ignore, key)
     {			/* brack > 0 */
       while (count)
 	{
-	  if (MB_CUR_MAX == 1 || rl_byte_oriented)
-	    pos++;
-	  else
-	    pos = _rl_find_next_mbchar (rl_line_buffer, pos, 1, MB_FIND_ANY);
-
-	  if (pos < rl_end)
+	  if (++pos < rl_end)
 	    {
 	      int b = rl_vi_bracktype (rl_line_buffer[pos]);
 	      if (b == -brack)
@@ -1240,7 +1108,7 @@ rl_vi_match (ignore, key)
 	    }
 	  else
 	    {
-	      rl_ding ();
+	      ding ();
 	      return -1;
 	    }
 	}
@@ -1265,11 +1133,6 @@ rl_vi_bracktype (c)
     }
 }
 
-/* XXX - think about reading an entire mbchar with _rl_read_mbchar and
-   inserting it in one bunch instead of the loop below (like in
-   rl_vi_char_search or _rl_vi_change_mbchar_case.  Set c to mbchar[0]
-   for test against 033 or ^C.  Make sure that _rl_read_mbchar does
-   this right. */
 int
 rl_vi_change_char (count, key)
      int count, key;
@@ -1279,11 +1142,7 @@ rl_vi_change_char (count, key)
   if (vi_redoing)
     c = _rl_vi_last_replacement;
   else
-    {
-      RL_SETSTATE(RL_STATE_MOREINPUT);
-      _rl_vi_last_replacement = c = rl_read_key ();
-      RL_UNSETSTATE(RL_STATE_MOREINPUT);
-    }
+    _rl_vi_last_replacement = c = (*rl_getc_function) (rl_instream);
 
   if (c == '\033' || c == CTRL ('C'))
     return -1;
@@ -1293,19 +1152,9 @@ rl_vi_change_char (count, key)
       rl_begin_undo_group ();
 
       rl_delete (1, c);
-#if defined (HANDLE_MULTIBYTE)
-      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-	while (_rl_insert_char (1, c))
-	  {
-	    RL_SETSTATE (RL_STATE_MOREINPUT);
-	    c = rl_read_key ();
-	    RL_UNSETSTATE (RL_STATE_MOREINPUT);
-	  }
-      else
-#endif
-	_rl_insert_char (1, c);
+      rl_insert (1, c);
       if (count == 0)
-	rl_backward_char (1, c);
+	rl_backward (1, c);
 
       rl_end_undo_group ();
     }
@@ -1316,29 +1165,66 @@ int
 rl_vi_subst (count, key)
      int count, key;
 {
-  /* If we are redoing, rl_vi_change_to will stuff the last motion char */
-  if (vi_redoing == 0)
-    rl_stuff_char ((key == 'S') ? 'c' : ' ');	/* `S' == `cc', `s' == `c ' */
+  rl_begin_undo_group ();
+
+  if (_rl_uppercase_p (key))
+    {
+      rl_beg_of_line (1, key);
+      rl_kill_line (1, key);
+    }
+  else
+    rl_delete_text (rl_point, rl_point+count);
+
+  rl_end_undo_group ();
 
-  return (rl_vi_change_to (count, 'c'));
+  _rl_vi_set_last (key, count, rl_arg_sign);
+
+  if (vi_redoing)
+    {
+      int o = _rl_doing_an_undo;
+
+      _rl_doing_an_undo = 1;
+      if (vi_insert_buffer && *vi_insert_buffer)
+	rl_insert_text (vi_insert_buffer);
+      _rl_doing_an_undo = o;
+    }
+  else
+    {
+      rl_begin_undo_group ();
+      _rl_vi_doing_insert = 1;
+      rl_vi_insertion_mode (1, key);
+    }
+
+  return (0);
 }
 
 int
 rl_vi_overstrike (count, key)
      int count, key;
 {
+  int i;
+
   if (_rl_vi_doing_insert == 0)
     {
       _rl_vi_doing_insert = 1;
       rl_begin_undo_group ();
     }
 
-  if (count > 0)
+  for (i = 0; i < count; i++)
     {
-      _rl_overwrite_char (count, key);
-      vi_replace_count += count;
-    }
+      vi_replace_count++;
+      rl_begin_undo_group ();
+
+      if (rl_point < rl_end)
+	{
+	  rl_delete (1, key);
+	  rl_insert (1, key);
+	}
+      else
+	rl_insert (1, key);
 
+      rl_end_undo_group ();
+    }
   return (0);
 }
 
@@ -1352,7 +1238,7 @@ rl_vi_overstrike_delete (count, key)
     {
       if (vi_replace_count == 0)
 	{
-	  rl_ding ();
+	  ding ();
 	  break;
 	}
       s = rl_point;
@@ -1361,7 +1247,7 @@ rl_vi_overstrike_delete (count, key)
 	vi_replace_count--;
 
       if (rl_point == s)
-	rl_backward_char (1, key);
+	rl_backward (1, key);
     }
 
   if (vi_replace_count == 0 && _rl_vi_doing_insert)
@@ -1422,7 +1308,7 @@ rl_vi_possible_completions()
     }
   else if (rl_line_buffer[rl_point - 1] == ';')
     {
-      rl_ding ();
+      ding ();
       return (0);
     }
 
@@ -1440,13 +1326,10 @@ rl_vi_set_mark (count, key)
 {
   int ch;
 
-  RL_SETSTATE(RL_STATE_MOREINPUT);
   ch = rl_read_key ();
-  RL_UNSETSTATE(RL_STATE_MOREINPUT);
-
-  if (ch < 'a' || ch > 'z')
+  if (_rl_lowercase_p (ch) == 0)
     {
-      rl_ding ();
+      ding ();
       return -1;
     }
   ch -= 'a';
@@ -1460,25 +1343,22 @@ rl_vi_goto_mark (count, key)
 {
   int ch;
 
-  RL_SETSTATE(RL_STATE_MOREINPUT);
   ch = rl_read_key ();
-  RL_UNSETSTATE(RL_STATE_MOREINPUT);
-
   if (ch == '`')
     {
       rl_point = rl_mark;
       return 0;
     }
-  else if (ch < 'a' || ch > 'z')
+  else if (_rl_lowercase_p (ch) == 0)
     {
-      rl_ding ();
+      ding ();
       return -1;
     }
 
   ch -= 'a';
   if (vi_mark_chars[ch] == -1)
     {
-      rl_ding ();
+      ding ();
       return -1;
     }
   rl_point = vi_mark_chars[ch];