Large dos2unix commit...

1 files changed, 1483 insertions, 1483 deletions

diff --git a/MSVC/readline/vi_mode.c b/MSVC/readline/vi_mode.c
index b879f07..6ea2161 100644
--- a/MSVC/readline/vi_mode.c
+++ b/MSVC/readline/vi_mode.c
@@ -1,1483 +1,1483 @@
-/* vi_mode.c -- A vi emulation mode for Bash.

-   Derived from code written by Jeff Sparkes (jsparkes@bnr.ca).  */

-

-/* Copyright (C) 1987, 1989, 1992 Free Software Foundation, Inc.

-

-   This file is part of the GNU Readline Library, a library for

-   reading lines of text with interactive input and history editing.

-

-   The GNU Readline Library is free software; you can redistribute it

-   and/or modify it under the terms of the GNU General Public License

-   as published by the Free Software Foundation; either version 2, or

-   (at your option) any later version.

-

-   The GNU Readline Library is distributed in the hope that it will be

-   useful, but WITHOUT ANY WARRANTY; without even the implied warranty

-   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-   GNU General Public License for more details.

-

-   The GNU General Public License is often shipped with GNU software, and

-   is generally kept in a file called COPYING or LICENSE.  If you do not

-   have a copy of the license, write to the Free Software Foundation,

-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */

-#define READLINE_LIBRARY

-

-/* **************************************************************** */

-/*								    */

-/*			VI Emulation Mode			    */

-/*								    */

-/* **************************************************************** */

-#include "rlconf.h"

-

-#if defined (VI_MODE)

-

-#include "config.h"

-

-#include <sys/types.h>

-

-#if defined (HAVE_STDLIB_H)

-#  include <stdlib.h>

-#else

-#  include "ansi_stdlib.h"

-#endif /* HAVE_STDLIB_H */

-

-#if defined (HAVE_UNISTD_H)

-#  include <unistd.h>

-#endif

-

-#include <stdio.h>

-

-/* Some standard library routines. */

-#include "rldefs.h"

-#include "rlmbutil.h"

-

-#include "readline.h"

-#include "history.h"

-

-#include "rlprivate.h"

-#include "xmalloc.h"

-

-#ifndef member

-#define member(c, s) ((c) ? (char *)strchr ((s), (c)) != (char *)NULL : 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|";

-

-/* Keymap used for vi replace characters.  Created dynamically since

-   rarely used. */

-static Keymap vi_replace_map;

-

-/* The number of characters inserted in the last replace operation. */

-static int vi_replace_count;

-

-/* If non-zero, we have text inserted after a c[motion] command that put

-   us implicitly into insert mode.  Some people want this text to be

-   attached to the command so that it is `redoable' with `.'. */

-static int vi_continued_command;

-static char *vi_insert_buffer;

-static int vi_insert_buffer_size;

-

-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;

-

-static int vi_redoing;

-

-/* Text modification commands.  These are the `redoable' commands. */

-static const char *vi_textmod = "_*\\AaIiCcDdPpYyRrSsXx~";

-

-/* Arrays for the saved marks. */

-static int vi_mark_chars['z' - 'a' + 1];

-

-static void _rl_vi_stuff_insert PARAMS((int));

-static void _rl_vi_save_insert PARAMS((UNDO_LIST *));

-static int rl_digit_loop1 PARAMS((void));

-

-void

-_rl_vi_initialize_line ()

-{

-  register int i;

-

-  for (i = 0; i < sizeof (vi_mark_chars) / sizeof (int); i++)

-    vi_mark_chars[i] = -1;

-}

-

-void

-_rl_vi_reset_last ()

-{

-  _rl_vi_last_command = 'i';

-  _rl_vi_last_repeat = 1;

-  _rl_vi_last_arg_sign = 1;

-  _rl_vi_last_motion = 0;

-}

-

-void

-_rl_vi_set_last (key, repeat, sign)

-     int key, repeat, sign;

-{

-  _rl_vi_last_command = key;

-  _rl_vi_last_repeat = repeat;

-  _rl_vi_last_arg_sign = sign;

-}

-

-/* Is the command C a VI mode text modification command? */

-int

-_rl_vi_textmod_command (c)

-     int c;

-{

-  return (member (c, vi_textmod));

-}

-

-static void

-_rl_vi_stuff_insert (count)

-     int count;

-{

-  rl_begin_undo_group ();

-  while (count--)

-    rl_insert_text (vi_insert_buffer);

-  rl_end_undo_group ();

-}

-

-/* Bound to `.'.  Called from command mode, so we know that we have to

-   redo a text modification command.  The default for _rl_vi_last_command

-   puts you back into insert mode. */

-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. */

-  if (_rl_vi_last_command == 'i' && vi_insert_buffer && *vi_insert_buffer)

-    {

-      _rl_vi_stuff_insert (count);

-      /* And back up point over the last character inserted. */

-      if (rl_point > 0)

-	rl_point--;

-    }

-  else

-    r = _rl_dispatch (_rl_vi_last_command, _rl_keymap);

-  vi_redoing = 0;

-

-  return (r);

-}

-

-/* A placeholder for further expansion. */

-int

-rl_vi_undo (count, key)

-     int count, key;

-{

-  return (rl_undo_command (count, key));

-}

-    

-/* Yank the nth arg from the previous line into this line at point. */

-int

-rl_vi_yank_arg (count, key)

-     int count, key;

-{

-  /* Readline thinks that the first word on a line is the 0th, while vi

-     thinks the first word on a line is the 1st.  Compensate. */

-  if (rl_explicit_arg)

-    rl_yank_nth_arg (count - 1, 0);

-  else

-    rl_yank_nth_arg ('$', 0);

-

-  return (0);

-}

-

-/* With an argument, move back that many history lines, else move to the

-   beginning of history. */

-int

-rl_vi_fetch_history (count, c)

-     int count, c;

-{

-  int wanted;

-

-  /* Giving an argument of n means we want the nth command in the history

-     file.  The command number is interpreted the same way that the bash

-     `history' command does it -- that is, giving an argument count of 450

-     to this command would get the command listed as number 450 in the

-     output of `history'. */

-  if (rl_explicit_arg)

-    {

-      wanted = history_base + where_history () - count;

-      if (wanted <= 0)

-        rl_beginning_of_history (0, 0);

-      else

-        rl_get_previous_history (wanted, c);

-    }

-  else

-    rl_beginning_of_history (count, 0);

-  return (0);

-}

-

-/* Search again for the last thing searched for. */

-int

-rl_vi_search_again (count, key)

-     int count, key;

-{

-  switch (key)

-    {

-    case 'n':

-      rl_noninc_reverse_search_again (count, key);

-      break;

-

-    case 'N':

-      rl_noninc_forward_search_again (count, key);

-      break;

-    }

-  return (0);

-}

-

-/* Do a vi style search. */

-int

-rl_vi_search (count, key)

-     int count, key;

-{

-  switch (key)

-    {

-    case '?':

-      rl_noninc_forward_search (count, key);

-      break;

-

-    case '/':

-      rl_noninc_reverse_search (count, key);

-      break;

-

-    default:

-      rl_ding ();

-      break;

-    }

-  return (0);

-}

-

-/* Completion, from vi's point of view. */

-int

-rl_vi_complete (ignore, key)

-     int ignore, key;

-{

-  if ((rl_point < rl_end) && (!whitespace (rl_line_buffer[rl_point])))

-    {

-      if (!whitespace (rl_line_buffer[rl_point + 1]))

-	rl_vi_end_word (1, 'E');

-      rl_point++;

-    }

-

-  if (key == '*')

-    rl_complete_internal ('*');	/* Expansion and replacement. */

-  else if (key == '=')

-    rl_complete_internal ('?');	/* List possible completions. */

-  else if (key == '\\')

-    rl_complete_internal (TAB);	/* Standard Readline completion. */

-  else

-    rl_complete (0, key);

-

-  if (key == '*' || key == '\\')

-    {

-      _rl_vi_set_last (key, 1, rl_arg_sign);

-      rl_vi_insertion_mode (1, key);

-    }

-  return (0);

-}

-

-/* Tilde expansion for vi mode. */

-int

-rl_vi_tilde_expand (ignore, key)

-     int ignore, key;

-{

-  rl_tilde_expand (0, key);

-  _rl_vi_set_last (key, 1, rl_arg_sign);	/* XXX */

-  rl_vi_insertion_mode (1, key);

-  return (0);

-}

-

-/* Previous word in vi mode. */

-int

-rl_vi_prev_word (count, key)

-     int count, key;

-{

-  if (count < 0)

-    return (rl_vi_next_word (-count, key));

-

-  if (rl_point == 0)

-    {

-      rl_ding ();

-      return (0);

-    }

-

-  if (_rl_uppercase_p (key))

-    rl_vi_bWord (count, key);

-  else

-    rl_vi_bword (count, key);

-

-  return (0);

-}

-

-/* Next word in vi mode. */

-int

-rl_vi_next_word (count, key)

-     int count, key;

-{

-  if (count < 0)

-    return (rl_vi_prev_word (-count, key));

-

-  if (rl_point >= (rl_end - 1))

-    {

-      rl_ding ();

-      return (0);

-    }

-

-  if (_rl_uppercase_p (key))

-    rl_vi_fWord (count, key);

-  else

-    rl_vi_fword (count, key);

-  return (0);

-}

-

-/* Move to the end of the ?next? word. */

-int

-rl_vi_end_word (count, key)

-     int count, key;

-{

-  if (count < 0)

-    {

-      rl_ding ();

-      return -1;

-    }

-

-  if (_rl_uppercase_p (key))

-    rl_vi_eWord (count, key);

-  else

-    rl_vi_eword (count, key);

-  return (0);

-}

-

-/* Move forward a word the way that 'W' does. */

-int

-rl_vi_fWord (count, ignore)

-     int count, ignore;

-{

-  while (count-- && rl_point < (rl_end - 1))

-    {

-      /* Skip until whitespace. */

-      while (!whitespace (rl_line_buffer[rl_point]) && rl_point < rl_end)

-	rl_point++;

-

-      /* Now skip whitespace. */

-      while (whitespace (rl_line_buffer[rl_point]) && rl_point < rl_end)

-	rl_point++;

-    }

-  return (0);

-}

-

-int

-rl_vi_bWord (count, ignore)

-     int count, ignore;

-{

-  while (count-- && rl_point > 0)

-    {

-      /* If we are at the start of a word, move back to whitespace so

-	 we will go back to the start of the previous word. */

-      if (!whitespace (rl_line_buffer[rl_point]) &&

-	  whitespace (rl_line_buffer[rl_point - 1]))

-	rl_point--;

-

-      while (rl_point > 0 && whitespace (rl_line_buffer[rl_point]))

-	rl_point--;

-

-      if (rl_point > 0)

-	{

-	  while (--rl_point >= 0 && !whitespace (rl_line_buffer[rl_point]));

-	  rl_point++;

-	}

-    }

-  return (0);

-}

-

-int

-rl_vi_eWord (count, ignore)

-     int count, ignore;

-{

-  while (count-- && rl_point < (rl_end - 1))

-    {

-      if (!whitespace (rl_line_buffer[rl_point]))

-	rl_point++;

-

-      /* Move to the next non-whitespace character (to the start of the

-	 next word). */

-      while (++rl_point < rl_end && whitespace (rl_line_buffer[rl_point]));

-

-      if (rl_point && rl_point < rl_end)

-	{

-	  /* Skip whitespace. */

-	  while (rl_point < rl_end && whitespace (rl_line_buffer[rl_point]))

-	    rl_point++;

-

-	  /* Skip until whitespace. */

-	  while (rl_point < rl_end && !whitespace (rl_line_buffer[rl_point]))

-	    rl_point++;

-

-	  /* Move back to the last character of the word. */

-	  rl_point--;

-	}

-    }

-  return (0);

-}

-

-int

-rl_vi_fword (count, ignore)

-     int count, ignore;

-{

-  while (count-- && rl_point < (rl_end - 1))

-    {

-      /* Move to white space (really non-identifer). */

-      if (_rl_isident (rl_line_buffer[rl_point]))

-	{

-	  while (_rl_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]) &&

-		 !whitespace (rl_line_buffer[rl_point]) && rl_point < rl_end)

-	    rl_point++;

-	}

-

-      /* Move past whitespace. */

-      while (whitespace (rl_line_buffer[rl_point]) && rl_point < rl_end)

-	rl_point++;

-    }

-  return (0);

-}

-

-int

-rl_vi_bword (count, ignore)

-     int count, ignore;

-{

-  while (count-- && rl_point > 0)

-    {

-      int last_is_ident;

-

-      /* If we are at the start of a word, move back to whitespace

-	 so we will go back to the start of the previous word. */

-      if (!whitespace (rl_line_buffer[rl_point]) &&

-	  whitespace (rl_line_buffer[rl_point - 1]))

-	rl_point--;

-

-      /* If this character and the previous character are `opposite', move

-	 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))

-	rl_point--;

-

-      while (rl_point > 0 && whitespace (rl_line_buffer[rl_point]))

-	rl_point--;

-

-      if (rl_point > 0)

-	{

-	  if (_rl_isident (rl_line_buffer[rl_point]))

-	    while (--rl_point >= 0 && _rl_isident (rl_line_buffer[rl_point]));

-	  else

-	    while (--rl_point >= 0 && !_rl_isident (rl_line_buffer[rl_point]) &&

-		   !whitespace (rl_line_buffer[rl_point]));

-	  rl_point++;

-	}

-    }

-  return (0);

-}

-

-int

-rl_vi_eword (count, ignore)

-     int count, ignore;

-{

-  while (count-- && rl_point < rl_end - 1)

-    {

-      if (!whitespace (rl_line_buffer[rl_point]))

-	rl_point++;

-

-      while (rl_point < rl_end && whitespace (rl_line_buffer[rl_point]))

-	rl_point++;

-

-      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]));

-	  else

-	    while (++rl_point < rl_end && !_rl_isident (rl_line_buffer[rl_point])

-		   && !whitespace (rl_line_buffer[rl_point]));

-	}

-      rl_point--;

-    }

-  return (0);

-}

-

-int

-rl_vi_insert_beg (count, key)

-     int count, key;

-{

-  rl_beg_of_line (1, key);

-  rl_vi_insertion_mode (1, key);

-  return (0);

-}

-

-int

-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_vi_insertion_mode (1, key);

-  return (0);

-}

-

-int

-rl_vi_append_eol (count, key)

-     int count, key;

-{

-  rl_end_of_line (1, key);

-  rl_vi_append_mode (1, key);

-  return (0);

-}

-

-/* What to do in the case of C-d. */

-int

-rl_vi_eof_maybe (count, c)

-     int count, c;

-{

-  return (rl_newline (1, '\n'));

-}

-

-/* Insertion mode stuff. */

-

-/* Switching from one mode to the other really just involves

-   switching keymaps. */

-int

-rl_vi_insertion_mode (count, key)

-     int count, key;

-{

-  _rl_keymap = vi_insertion_keymap;

-  _rl_vi_last_key_before_insert = key;

-  return (0);

-}

-

-static void

-_rl_vi_save_insert (up)

-      UNDO_LIST *up;

-{

-  int len, start, end;

-

-  if (up == 0)

-    {

-      if (vi_insert_buffer_size >= 1)

-	vi_insert_buffer[0] = '\0';

-      return;

-    }

-

-  start = up->start;

-  end = up->end;

-  len = end - start + 1;

-  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);

-    }

-  strncpy (vi_insert_buffer, rl_line_buffer + start, len - 1);

-  vi_insert_buffer[len-1] = '\0';

-}

-    

-void

-_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

-	 mode.  It gets copied to VI_INSERT_BUFFER because it depends

-	 on absolute indices into the line which may change (though they

-	 probably will not). */

-      _rl_vi_doing_insert = 0;

-      _rl_vi_save_insert (rl_undo_list->next);

-      vi_continued_command = 1;

-    }

-  else

-    {

-      if (_rl_vi_last_key_before_insert == 'i' && rl_undo_list)

-        _rl_vi_save_insert (rl_undo_list);

-      /* XXX - Other keys probably need to be checked. */

-      else if (_rl_vi_last_key_before_insert == 'C')

-	rl_end_undo_group ();

-      while (_rl_undo_group_level > 0)

-	rl_end_undo_group ();

-      vi_continued_command = 0;

-    }

-}

-

-int

-rl_vi_movement_mode (count, key)

-     int count, key;

-{

-  if (rl_point > 0)

-    rl_backward_char (1, key);

-

-  _rl_keymap = vi_movement_keymap;

-  _rl_vi_done_inserting ();

-  return (0);

-}

-

-int

-rl_vi_arg_digit (count, c)

-     int count, c;

-{

-  if (c == '0' && rl_numeric_arg == 1 && !rl_explicit_arg)

-    return (rl_beg_of_line (1, c));

-  else

-    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];

-  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)

-	{

-	  wctomb (mb, wc);

-	  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;

-{

-  char c = 0;

-

-  /* Don't try this on an empty line. */

-  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]))

-	c = _rl_to_lower (rl_line_buffer[rl_point]);

-      else if (_rl_lowercase_p (rl_line_buffer[rl_point]))

-	c = _rl_to_upper (rl_line_buffer[rl_point]);

-      else

-	{

-	  /* Just skip over characters neither upper nor lower case. */

-	  rl_forward_char (1, c);

-	  continue;

-	}

-

-      /* Vi is kind of strange here. */

-      if (c)

-	{

-	  rl_begin_undo_group ();

-	  rl_delete (1, c);

-	  _rl_insert_char (1, c);

-	  rl_end_undo_group ();

-	  rl_vi_check ();

-        }

-      else

-	rl_forward_char (1, c);

-    }

-  return (0);

-}

-

-int

-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_yank (1, key);

-  rl_backward_char (1, key);

-  return (0);

-}

-

-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--;

-    }

-  return (0);

-}

-

-int

-rl_vi_column (count, key)

-     int count, key;

-{

-  if (count > rl_end)

-    rl_end_of_line (1, key);

-  else

-    rl_point = count - 1;

-  return (0);

-}

-

-int

-rl_vi_domove (key, nextkey)

-     int key, *nextkey;

-{

-  int c, save;

-  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))

-    {

-      if (_rl_digit_p (c))

-	{

-	  save = rl_numeric_arg;

-	  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'))

-	{

-	  rl_mark = rl_end;

-	  rl_beg_of_line (1, c);

-	  _rl_vi_last_motion = c;

-	  return (0);

-	}

-      else

-	return (-1);

-    }

-

-  _rl_vi_last_motion = c;

-

-  /* Append a blank character temporarily so that the motion routines

-     work right at the end of the line. */

-  old_end = rl_end;

-  rl_line_buffer[rl_end++] = ' ';

-  rl_line_buffer[rl_end] = '\0';

-

-  _rl_dispatch (c, _rl_keymap);

-

-  /* Remove the blank that we added. */

-  rl_end = old_end;

-  rl_line_buffer[rl_end] = '\0';

-  if (rl_point > rl_end)

-    rl_point = rl_end;

-

-  /* No change in position means the command failed. */

-  if (rl_mark == rl_point)

-    return (-1);

-

-  /* rl_vi_f[wW]ord () leaves the cursor on the first character of the next

-     word.  If we are not at the end of the line, and we are on a

-     non-whitespace character, move back one (presumably to whitespace). */

-  if ((_rl_to_upper (c) == 'W') && rl_point < rl_end && rl_point > rl_mark &&

-      !whitespace (rl_line_buffer[rl_point]))

-    rl_point--;

-

-  /* If cw or cW, back up to the end of a word, so the behaviour of ce

-     or cE is the actual result.  Brute-force, no subtlety. */

-  if (key == 'c' && rl_point >= rl_mark && (_rl_to_upper (c) == 'W'))

-    {

-      /* Don't move farther back than where we started. */

-      while (rl_point > rl_mark && whitespace (rl_line_buffer[rl_point]))

-	rl_point--;

-

-      /* Posix.2 says that if cw or cW moves the cursor towards the end of

-	 the line, the character under the cursor should be deleted. */

-      if (rl_point == rl_mark)

-        rl_point++;

-      else

-	{

-	  /* Move past the end of the word so that the kill doesn't

-	     remove the last letter of the previous word.  Only do this

-	     if we are not at the end of the line. */

-	  if (rl_point >= 0 && rl_point < (rl_end - 1) && !whitespace (rl_line_buffer[rl_point]))

-	    rl_point++;

-	}

-    }

-

-  if (rl_mark < rl_point)

-    SWAP (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? */

-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);

-      key = c = rl_read_key ();

-      RL_UNSETSTATE(RL_STATE_MOREINPUT);

-

-      if (c >= 0 && _rl_keymap[c].type == ISFUNC &&

-	  _rl_keymap[c].function == rl_universal_argument)

-	{

-	  rl_numeric_arg *= 4;

-	  continue;

-	}

-

-      c = UNMETA (c);

-      if (_rl_digit_p (c))

-	{

-	  if (rl_explicit_arg)

-	    rl_numeric_arg = (rl_numeric_arg * 10) + _rl_digit_value (c);

-	  else

-	    rl_numeric_arg = _rl_digit_value (c);

-	  rl_explicit_arg = 1;

-	}

-      else

-	{

-	  rl_clear_message ();

-	  rl_stuff_char (key);

-	  break;

-	}

-    }

-

-  RL_UNSETSTATE(RL_STATE_NUMERICARG);

-  return (0);

-}

-

-int

-rl_vi_delete_to (count, key)

-     int count, key;

-{

-  int c;

-

-  if (_rl_uppercase_p (key))

-    rl_stuff_char ('$');

-  else if (vi_redoing)

-    rl_stuff_char (_rl_vi_last_motion);

-

-  if (rl_vi_domove (key, &c))

-    {

-      rl_ding ();

-      return -1;

-    }

-

-  /* These are the motion commands that do not require adjusting the

-     mark. */

-  if ((strchr (" l|h^0bB", c) == 0) && (rl_mark < rl_end))

-    rl_mark++;

-

-  rl_kill_text (rl_point, rl_mark);

-  return (0);

-}

-

-int

-rl_vi_change_to (count, key)

-     int count, key;

-{

-  int c, start_pos;

-

-  if (_rl_uppercase_p (key))

-    rl_stuff_char ('$');

-  else if (vi_redoing)

-    rl_stuff_char (_rl_vi_last_motion);

-

-  start_pos = rl_point;

-

-  if (rl_vi_domove (key, &c))

-    {

-      rl_ding ();

-      return -1;

-    }

-

-  /* These are the motion commands that do not require adjusting the

-     mark.  c[wW] are handled by special-case code in rl_vi_domove(),

-     and already leave the mark at the correct location. */

-  if ((strchr (" l|hwW^0bB", c) == 0) && (rl_mark < rl_end))

-    rl_mark++;

-

-  /* The cursor never moves with c[wW]. */

-  if ((_rl_to_upper (c) == 'W') && rl_point < start_pos)

-    rl_point = start_pos;

-

-  if (vi_redoing)

-    {

-      if (vi_insert_buffer && *vi_insert_buffer)

-	rl_begin_undo_group ();

-      rl_delete_text (rl_point, rl_mark);

-      if (vi_insert_buffer && *vi_insert_buffer)

-	{

-	  rl_insert_text (vi_insert_buffer);

-	  rl_end_undo_group ();

-	}

-    }

-  else

-    {

-      rl_begin_undo_group ();		/* to make the `u' command work */

-      rl_kill_text (rl_point, rl_mark);

-      /* `C' does not save the text inserted for undoing or redoing. */

-      if (_rl_uppercase_p (key) == 0)

-        _rl_vi_doing_insert = 1;

-      _rl_vi_set_last (key, count, rl_arg_sign);

-      rl_vi_insertion_mode (1, key);

-    }

-

-  return (0);

-}

-

-int

-rl_vi_yank_to (count, key)

-     int count, key;

-{

-  int c, save = rl_point;

-

-  if (_rl_uppercase_p (key))

-    rl_stuff_char ('$');

-

-  if (rl_vi_domove (key, &c))

-    {

-      rl_ding ();

-      return -1;

-    }

-

-  /* These are the motion commands that do not require adjusting the

-     mark. */

-  if ((strchr (" l|h^0%bB", c) == 0) && (rl_mark < rl_end))

-    rl_mark++;

-

-  rl_begin_undo_group ();

-  rl_kill_text (rl_point, rl_mark);

-  rl_end_undo_group ();

-  rl_do_undo ();

-  rl_point = save;

-

-  return (0);

-}

-

-int

-rl_vi_delete (count, key)

-     int count, key;

-{

-  int end;

-

-  if (rl_end == 0)

-    {

-      rl_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;

-

-  if (end >= rl_end)

-    end = rl_end;

-

-  rl_kill_text (rl_point, end);

-  

-  if (rl_point > 0 && rl_point == rl_end)

-    rl_backward_char (1, key);

-  return (0);

-}

-

-int

-rl_vi_back_to_indent (count, key)

-     int count, key;

-{

-  rl_beg_of_line (1, key);

-  while (rl_point < rl_end && whitespace (rl_line_buffer[rl_point]))

-    rl_point++;

-  return (0);

-}

-

-int

-rl_vi_first_print (count, key)

-     int count, key;

-{

-  return (rl_vi_back_to_indent (1, key));

-}

-

-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 == ',')

-    dir = key == ';' ? orig_dir : -orig_dir;

-  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

-	}

-

-      switch (key)

-        {

-        case 't':

-          orig_dir = dir = FTO;

-          break;

-

-        case 'T':

-          orig_dir = dir = BTO;

-          break;

-

-        case 'f':

-          orig_dir = dir = FFIND;

-          break;

-

-        case 'F':

-          orig_dir = dir = BFIND;

-          break;

-        }

-    }

-

-#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 */

-int

-rl_vi_match (ignore, key)

-     int ignore, key;

-{

-  int count = 1, brack, pos, tmp, pre;

-

-  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);

-

-      if (brack <= 0)

-	{

-	  rl_point = pos;

-	  rl_ding ();

-	  return -1;

-	}

-    }

-

-  pos = rl_point;

-

-  if (brack < 0)

-    {

-      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)

-	    {

-	      int b = rl_vi_bracktype (rl_line_buffer[pos]);

-	      if (b == -brack)

-		count--;

-	      else if (b == brack)

-		count++;

-	    }

-	  else

-	    {

-	      rl_ding ();

-	      return -1;

-	    }

-	}

-    }

-  else

-    {			/* 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)

-	    {

-	      int b = rl_vi_bracktype (rl_line_buffer[pos]);

-	      if (b == -brack)

-		count--;

-	      else if (b == brack)

-		count++;

-	    }

-	  else

-	    {

-	      rl_ding ();

-	      return -1;

-	    }

-	}

-    }

-  rl_point = pos;

-  return (0);

-}

-

-int

-rl_vi_bracktype (c)

-     int c;

-{

-  switch (c)

-    {

-    case '(': return  1;

-    case ')': return -1;

-    case '[': return  2;

-    case ']': return -2;

-    case '{': return  3;

-    case '}': return -3;

-    default:  return  0;

-    }

-}

-

-/* 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;

-{

-  int c;

-

-  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);

-    }

-

-  if (c == '\033' || c == CTRL ('C'))

-    return -1;

-

-  while (count-- && rl_point < rl_end)

-    {

-      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);

-      if (count == 0)

-	rl_backward_char (1, c);

-

-      rl_end_undo_group ();

-    }

-  return (0);

-}

-

-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 ' */

-

-  return (rl_vi_change_to (count, 'c'));

-}

-

-int

-rl_vi_overstrike (count, key)

-     int count, key;

-{

-  if (_rl_vi_doing_insert == 0)

-    {

-      _rl_vi_doing_insert = 1;

-      rl_begin_undo_group ();

-    }

-

-  if (count > 0)

-    {

-      _rl_overwrite_char (count, key);

-      vi_replace_count += count;

-    }

-

-  return (0);

-}

-

-int

-rl_vi_overstrike_delete (count, key)

-     int count, key;

-{

-  int i, s;

-

-  for (i = 0; i < count; i++)

-    {

-      if (vi_replace_count == 0)

-	{

-	  rl_ding ();

-	  break;

-	}

-      s = rl_point;

-

-      if (rl_do_undo ())

-	vi_replace_count--;

-

-      if (rl_point == s)

-	rl_backward_char (1, key);

-    }

-

-  if (vi_replace_count == 0 && _rl_vi_doing_insert)

-    {

-      rl_end_undo_group ();

-      rl_do_undo ();

-      _rl_vi_doing_insert = 0;

-    }

-  return (0);

-}

-

-int

-rl_vi_replace (count, key)

-     int count, key;

-{

-  int i;

-

-  vi_replace_count = 0;

-

-  if (!vi_replace_map)

-    {

-      vi_replace_map = rl_make_bare_keymap ();

-

-      for (i = ' '; i < KEYMAP_SIZE; i++)

-	vi_replace_map[i].function = rl_vi_overstrike;

-

-      vi_replace_map[RUBOUT].function = rl_vi_overstrike_delete;

-      vi_replace_map[ESC].function = rl_vi_movement_mode;

-      vi_replace_map[RETURN].function = rl_newline;

-      vi_replace_map[NEWLINE].function = rl_newline;

-

-      /* If the normal vi insertion keymap has ^H bound to erase, do the

-         same here.  Probably should remove the assignment to RUBOUT up

-         there, but I don't think it will make a difference in real life. */

-      if (vi_insertion_keymap[CTRL ('H')].type == ISFUNC &&

-	  vi_insertion_keymap[CTRL ('H')].function == rl_rubout)

-	vi_replace_map[CTRL ('H')].function = rl_vi_overstrike_delete;

-

-    }

-  _rl_keymap = vi_replace_map;

-  return (0);

-}

-

-#if 0

-/* Try to complete the word we are standing on or the word that ends with

-   the previous character.  A space matches everything.  Word delimiters are

-   space and ;. */

-int

-rl_vi_possible_completions()

-{

-  int save_pos = rl_point;

-

-  if (rl_line_buffer[rl_point] != ' ' && rl_line_buffer[rl_point] != ';')

-    {

-      while (rl_point < rl_end && rl_line_buffer[rl_point] != ' ' &&

-	     rl_line_buffer[rl_point] != ';')

-	rl_point++;

-    }

-  else if (rl_line_buffer[rl_point - 1] == ';')

-    {

-      rl_ding ();

-      return (0);

-    }

-

-  rl_possible_completions ();

-  rl_point = save_pos;

-

-  return (0);

-}

-#endif

-

-/* Functions to save and restore marks. */

-int

-rl_vi_set_mark (count, key)

-     int count, key;

-{

-  int ch;

-

-  RL_SETSTATE(RL_STATE_MOREINPUT);

-  ch = rl_read_key ();

-  RL_UNSETSTATE(RL_STATE_MOREINPUT);

-

-  if (ch < 'a' || ch > 'z')

-    {

-      rl_ding ();

-      return -1;

-    }

-  ch -= 'a';

-  vi_mark_chars[ch] = rl_point;

-  return 0;

-}

-

-int

-rl_vi_goto_mark (count, key)

-     int 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')

-    {

-      rl_ding ();

-      return -1;

-    }

-

-  ch -= 'a';

-  if (vi_mark_chars[ch] == -1)

-    {

-      rl_ding ();

-      return -1;

-    }

-  rl_point = vi_mark_chars[ch];

-  return 0;

-}

-

-#endif /* VI_MODE */

+/* vi_mode.c -- A vi emulation mode for Bash.
+   Derived from code written by Jeff Sparkes (jsparkes@bnr.ca).  */
+
+/* Copyright (C) 1987, 1989, 1992 Free Software Foundation, Inc.
+
+   This file is part of the GNU Readline Library, a library for
+   reading lines of text with interactive input and history editing.
+
+   The GNU Readline Library is free software; you can redistribute it
+   and/or modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; either version 2, or
+   (at your option) any later version.
+
+   The GNU Readline Library is distributed in the hope that it will be
+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   The GNU General Public License is often shipped with GNU software, and
+   is generally kept in a file called COPYING or LICENSE.  If you do not
+   have a copy of the license, write to the Free Software Foundation,
+   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#define READLINE_LIBRARY
+
+/* **************************************************************** */
+/*								    */
+/*			VI Emulation Mode			    */
+/*								    */
+/* **************************************************************** */
+#include "rlconf.h"
+
+#if defined (VI_MODE)
+
+#include "config.h"
+
+#include <sys/types.h>
+
+#if defined (HAVE_STDLIB_H)
+#  include <stdlib.h>
+#else
+#  include "ansi_stdlib.h"
+#endif /* HAVE_STDLIB_H */
+
+#if defined (HAVE_UNISTD_H)
+#  include <unistd.h>
+#endif
+
+#include <stdio.h>
+
+/* Some standard library routines. */
+#include "rldefs.h"
+#include "rlmbutil.h"
+
+#include "readline.h"
+#include "history.h"
+
+#include "rlprivate.h"
+#include "xmalloc.h"
+
+#ifndef member
+#define member(c, s) ((c) ? (char *)strchr ((s), (c)) != (char *)NULL : 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|";
+
+/* Keymap used for vi replace characters.  Created dynamically since
+   rarely used. */
+static Keymap vi_replace_map;
+
+/* The number of characters inserted in the last replace operation. */
+static int vi_replace_count;
+
+/* If non-zero, we have text inserted after a c[motion] command that put
+   us implicitly into insert mode.  Some people want this text to be
+   attached to the command so that it is `redoable' with `.'. */
+static int vi_continued_command;
+static char *vi_insert_buffer;
+static int vi_insert_buffer_size;
+
+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;
+
+static int vi_redoing;
+
+/* Text modification commands.  These are the `redoable' commands. */
+static const char *vi_textmod = "_*\\AaIiCcDdPpYyRrSsXx~";
+
+/* Arrays for the saved marks. */
+static int vi_mark_chars['z' - 'a' + 1];
+
+static void _rl_vi_stuff_insert PARAMS((int));
+static void _rl_vi_save_insert PARAMS((UNDO_LIST *));
+static int rl_digit_loop1 PARAMS((void));
+
+void
+_rl_vi_initialize_line ()
+{
+  register int i;
+
+  for (i = 0; i < sizeof (vi_mark_chars) / sizeof (int); i++)
+    vi_mark_chars[i] = -1;
+}
+
+void
+_rl_vi_reset_last ()
+{
+  _rl_vi_last_command = 'i';
+  _rl_vi_last_repeat = 1;
+  _rl_vi_last_arg_sign = 1;
+  _rl_vi_last_motion = 0;
+}
+
+void
+_rl_vi_set_last (key, repeat, sign)
+     int key, repeat, sign;
+{
+  _rl_vi_last_command = key;
+  _rl_vi_last_repeat = repeat;
+  _rl_vi_last_arg_sign = sign;
+}
+
+/* Is the command C a VI mode text modification command? */
+int
+_rl_vi_textmod_command (c)
+     int c;
+{
+  return (member (c, vi_textmod));
+}
+
+static void
+_rl_vi_stuff_insert (count)
+     int count;
+{
+  rl_begin_undo_group ();
+  while (count--)
+    rl_insert_text (vi_insert_buffer);
+  rl_end_undo_group ();
+}
+
+/* Bound to `.'.  Called from command mode, so we know that we have to
+   redo a text modification command.  The default for _rl_vi_last_command
+   puts you back into insert mode. */
+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. */
+  if (_rl_vi_last_command == 'i' && vi_insert_buffer && *vi_insert_buffer)
+    {
+      _rl_vi_stuff_insert (count);
+      /* And back up point over the last character inserted. */
+      if (rl_point > 0)
+	rl_point--;
+    }
+  else
+    r = _rl_dispatch (_rl_vi_last_command, _rl_keymap);
+  vi_redoing = 0;
+
+  return (r);
+}
+
+/* A placeholder for further expansion. */
+int
+rl_vi_undo (count, key)
+     int count, key;
+{
+  return (rl_undo_command (count, key));
+}
+    
+/* Yank the nth arg from the previous line into this line at point. */
+int
+rl_vi_yank_arg (count, key)
+     int count, key;
+{
+  /* Readline thinks that the first word on a line is the 0th, while vi
+     thinks the first word on a line is the 1st.  Compensate. */
+  if (rl_explicit_arg)
+    rl_yank_nth_arg (count - 1, 0);
+  else
+    rl_yank_nth_arg ('$', 0);
+
+  return (0);
+}
+
+/* With an argument, move back that many history lines, else move to the
+   beginning of history. */
+int
+rl_vi_fetch_history (count, c)
+     int count, c;
+{
+  int wanted;
+
+  /* Giving an argument of n means we want the nth command in the history
+     file.  The command number is interpreted the same way that the bash
+     `history' command does it -- that is, giving an argument count of 450
+     to this command would get the command listed as number 450 in the
+     output of `history'. */
+  if (rl_explicit_arg)
+    {
+      wanted = history_base + where_history () - count;
+      if (wanted <= 0)
+        rl_beginning_of_history (0, 0);
+      else
+        rl_get_previous_history (wanted, c);
+    }
+  else
+    rl_beginning_of_history (count, 0);
+  return (0);
+}
+
+/* Search again for the last thing searched for. */
+int
+rl_vi_search_again (count, key)
+     int count, key;
+{
+  switch (key)
+    {
+    case 'n':
+      rl_noninc_reverse_search_again (count, key);
+      break;
+
+    case 'N':
+      rl_noninc_forward_search_again (count, key);
+      break;
+    }
+  return (0);
+}
+
+/* Do a vi style search. */
+int
+rl_vi_search (count, key)
+     int count, key;
+{
+  switch (key)
+    {
+    case '?':
+      rl_noninc_forward_search (count, key);
+      break;
+
+    case '/':
+      rl_noninc_reverse_search (count, key);
+      break;
+
+    default:
+      rl_ding ();
+      break;
+    }
+  return (0);
+}
+
+/* Completion, from vi's point of view. */
+int
+rl_vi_complete (ignore, key)
+     int ignore, key;
+{
+  if ((rl_point < rl_end) && (!whitespace (rl_line_buffer[rl_point])))
+    {
+      if (!whitespace (rl_line_buffer[rl_point + 1]))
+	rl_vi_end_word (1, 'E');
+      rl_point++;
+    }
+
+  if (key == '*')
+    rl_complete_internal ('*');	/* Expansion and replacement. */
+  else if (key == '=')
+    rl_complete_internal ('?');	/* List possible completions. */
+  else if (key == '\\')
+    rl_complete_internal (TAB);	/* Standard Readline completion. */
+  else
+    rl_complete (0, key);
+
+  if (key == '*' || key == '\\')
+    {
+      _rl_vi_set_last (key, 1, rl_arg_sign);
+      rl_vi_insertion_mode (1, key);
+    }
+  return (0);
+}
+
+/* Tilde expansion for vi mode. */
+int
+rl_vi_tilde_expand (ignore, key)
+     int ignore, key;
+{
+  rl_tilde_expand (0, key);
+  _rl_vi_set_last (key, 1, rl_arg_sign);	/* XXX */
+  rl_vi_insertion_mode (1, key);
+  return (0);
+}
+
+/* Previous word in vi mode. */
+int
+rl_vi_prev_word (count, key)
+     int count, key;
+{
+  if (count < 0)
+    return (rl_vi_next_word (-count, key));
+
+  if (rl_point == 0)
+    {
+      rl_ding ();
+      return (0);
+    }
+
+  if (_rl_uppercase_p (key))
+    rl_vi_bWord (count, key);
+  else
+    rl_vi_bword (count, key);
+
+  return (0);
+}
+
+/* Next word in vi mode. */
+int
+rl_vi_next_word (count, key)
+     int count, key;
+{
+  if (count < 0)
+    return (rl_vi_prev_word (-count, key));
+
+  if (rl_point >= (rl_end - 1))
+    {
+      rl_ding ();
+      return (0);
+    }
+
+  if (_rl_uppercase_p (key))
+    rl_vi_fWord (count, key);
+  else
+    rl_vi_fword (count, key);
+  return (0);
+}
+
+/* Move to the end of the ?next? word. */
+int
+rl_vi_end_word (count, key)
+     int count, key;
+{
+  if (count < 0)
+    {
+      rl_ding ();
+      return -1;
+    }
+
+  if (_rl_uppercase_p (key))
+    rl_vi_eWord (count, key);
+  else
+    rl_vi_eword (count, key);
+  return (0);
+}
+
+/* Move forward a word the way that 'W' does. */
+int
+rl_vi_fWord (count, ignore)
+     int count, ignore;
+{
+  while (count-- && rl_point < (rl_end - 1))
+    {
+      /* Skip until whitespace. */
+      while (!whitespace (rl_line_buffer[rl_point]) && rl_point < rl_end)
+	rl_point++;
+
+      /* Now skip whitespace. */
+      while (whitespace (rl_line_buffer[rl_point]) && rl_point < rl_end)
+	rl_point++;
+    }
+  return (0);
+}
+
+int
+rl_vi_bWord (count, ignore)
+     int count, ignore;
+{
+  while (count-- && rl_point > 0)
+    {
+      /* If we are at the start of a word, move back to whitespace so
+	 we will go back to the start of the previous word. */
+      if (!whitespace (rl_line_buffer[rl_point]) &&
+	  whitespace (rl_line_buffer[rl_point - 1]))
+	rl_point--;
+
+      while (rl_point > 0 && whitespace (rl_line_buffer[rl_point]))
+	rl_point--;
+
+      if (rl_point > 0)
+	{
+	  while (--rl_point >= 0 && !whitespace (rl_line_buffer[rl_point]));
+	  rl_point++;
+	}
+    }
+  return (0);
+}
+
+int
+rl_vi_eWord (count, ignore)
+     int count, ignore;
+{
+  while (count-- && rl_point < (rl_end - 1))
+    {
+      if (!whitespace (rl_line_buffer[rl_point]))
+	rl_point++;
+
+      /* Move to the next non-whitespace character (to the start of the
+	 next word). */
+      while (++rl_point < rl_end && whitespace (rl_line_buffer[rl_point]));
+
+      if (rl_point && rl_point < rl_end)
+	{
+	  /* Skip whitespace. */
+	  while (rl_point < rl_end && whitespace (rl_line_buffer[rl_point]))
+	    rl_point++;
+
+	  /* Skip until whitespace. */
+	  while (rl_point < rl_end && !whitespace (rl_line_buffer[rl_point]))
+	    rl_point++;
+
+	  /* Move back to the last character of the word. */
+	  rl_point--;
+	}
+    }
+  return (0);
+}
+
+int
+rl_vi_fword (count, ignore)
+     int count, ignore;
+{
+  while (count-- && rl_point < (rl_end - 1))
+    {
+      /* Move to white space (really non-identifer). */
+      if (_rl_isident (rl_line_buffer[rl_point]))
+	{
+	  while (_rl_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]) &&
+		 !whitespace (rl_line_buffer[rl_point]) && rl_point < rl_end)
+	    rl_point++;
+	}
+
+      /* Move past whitespace. */
+      while (whitespace (rl_line_buffer[rl_point]) && rl_point < rl_end)
+	rl_point++;
+    }
+  return (0);
+}
+
+int
+rl_vi_bword (count, ignore)
+     int count, ignore;
+{
+  while (count-- && rl_point > 0)
+    {
+      int last_is_ident;
+
+      /* If we are at the start of a word, move back to whitespace
+	 so we will go back to the start of the previous word. */
+      if (!whitespace (rl_line_buffer[rl_point]) &&
+	  whitespace (rl_line_buffer[rl_point - 1]))
+	rl_point--;
+
+      /* If this character and the previous character are `opposite', move
+	 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))
+	rl_point--;
+
+      while (rl_point > 0 && whitespace (rl_line_buffer[rl_point]))
+	rl_point--;
+
+      if (rl_point > 0)
+	{
+	  if (_rl_isident (rl_line_buffer[rl_point]))
+	    while (--rl_point >= 0 && _rl_isident (rl_line_buffer[rl_point]));
+	  else
+	    while (--rl_point >= 0 && !_rl_isident (rl_line_buffer[rl_point]) &&
+		   !whitespace (rl_line_buffer[rl_point]));
+	  rl_point++;
+	}
+    }
+  return (0);
+}
+
+int
+rl_vi_eword (count, ignore)
+     int count, ignore;
+{
+  while (count-- && rl_point < rl_end - 1)
+    {
+      if (!whitespace (rl_line_buffer[rl_point]))
+	rl_point++;
+
+      while (rl_point < rl_end && whitespace (rl_line_buffer[rl_point]))
+	rl_point++;
+
+      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]));
+	  else
+	    while (++rl_point < rl_end && !_rl_isident (rl_line_buffer[rl_point])
+		   && !whitespace (rl_line_buffer[rl_point]));
+	}
+      rl_point--;
+    }
+  return (0);
+}
+
+int
+rl_vi_insert_beg (count, key)
+     int count, key;
+{
+  rl_beg_of_line (1, key);
+  rl_vi_insertion_mode (1, key);
+  return (0);
+}
+
+int
+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_vi_insertion_mode (1, key);
+  return (0);
+}
+
+int
+rl_vi_append_eol (count, key)
+     int count, key;
+{
+  rl_end_of_line (1, key);
+  rl_vi_append_mode (1, key);
+  return (0);
+}
+
+/* What to do in the case of C-d. */
+int
+rl_vi_eof_maybe (count, c)
+     int count, c;
+{
+  return (rl_newline (1, '\n'));
+}
+
+/* Insertion mode stuff. */
+
+/* Switching from one mode to the other really just involves
+   switching keymaps. */
+int
+rl_vi_insertion_mode (count, key)
+     int count, key;
+{
+  _rl_keymap = vi_insertion_keymap;
+  _rl_vi_last_key_before_insert = key;
+  return (0);
+}
+
+static void
+_rl_vi_save_insert (up)
+      UNDO_LIST *up;
+{
+  int len, start, end;
+
+  if (up == 0)
+    {
+      if (vi_insert_buffer_size >= 1)
+	vi_insert_buffer[0] = '\0';
+      return;
+    }
+
+  start = up->start;
+  end = up->end;
+  len = end - start + 1;
+  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);
+    }
+  strncpy (vi_insert_buffer, rl_line_buffer + start, len - 1);
+  vi_insert_buffer[len-1] = '\0';
+}
+    
+void
+_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
+	 mode.  It gets copied to VI_INSERT_BUFFER because it depends
+	 on absolute indices into the line which may change (though they
+	 probably will not). */
+      _rl_vi_doing_insert = 0;
+      _rl_vi_save_insert (rl_undo_list->next);
+      vi_continued_command = 1;
+    }
+  else
+    {
+      if (_rl_vi_last_key_before_insert == 'i' && rl_undo_list)
+        _rl_vi_save_insert (rl_undo_list);
+      /* XXX - Other keys probably need to be checked. */
+      else if (_rl_vi_last_key_before_insert == 'C')
+	rl_end_undo_group ();
+      while (_rl_undo_group_level > 0)
+	rl_end_undo_group ();
+      vi_continued_command = 0;
+    }
+}
+
+int
+rl_vi_movement_mode (count, key)
+     int count, key;
+{
+  if (rl_point > 0)
+    rl_backward_char (1, key);
+
+  _rl_keymap = vi_movement_keymap;
+  _rl_vi_done_inserting ();
+  return (0);
+}
+
+int
+rl_vi_arg_digit (count, c)
+     int count, c;
+{
+  if (c == '0' && rl_numeric_arg == 1 && !rl_explicit_arg)
+    return (rl_beg_of_line (1, c));
+  else
+    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];
+  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)
+	{
+	  wctomb (mb, wc);
+	  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;
+{
+  char c = 0;
+
+  /* Don't try this on an empty line. */
+  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]))
+	c = _rl_to_lower (rl_line_buffer[rl_point]);
+      else if (_rl_lowercase_p (rl_line_buffer[rl_point]))
+	c = _rl_to_upper (rl_line_buffer[rl_point]);
+      else
+	{
+	  /* Just skip over characters neither upper nor lower case. */
+	  rl_forward_char (1, c);
+	  continue;
+	}
+
+      /* Vi is kind of strange here. */
+      if (c)
+	{
+	  rl_begin_undo_group ();
+	  rl_delete (1, c);
+	  _rl_insert_char (1, c);
+	  rl_end_undo_group ();
+	  rl_vi_check ();
+        }
+      else
+	rl_forward_char (1, c);
+    }
+  return (0);
+}
+
+int
+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_yank (1, key);
+  rl_backward_char (1, key);
+  return (0);
+}
+
+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--;
+    }
+  return (0);
+}
+
+int
+rl_vi_column (count, key)
+     int count, key;
+{
+  if (count > rl_end)
+    rl_end_of_line (1, key);
+  else
+    rl_point = count - 1;
+  return (0);
+}
+
+int
+rl_vi_domove (key, nextkey)
+     int key, *nextkey;
+{
+  int c, save;
+  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))
+    {
+      if (_rl_digit_p (c))
+	{
+	  save = rl_numeric_arg;
+	  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'))
+	{
+	  rl_mark = rl_end;
+	  rl_beg_of_line (1, c);
+	  _rl_vi_last_motion = c;
+	  return (0);
+	}
+      else
+	return (-1);
+    }
+
+  _rl_vi_last_motion = c;
+
+  /* Append a blank character temporarily so that the motion routines
+     work right at the end of the line. */
+  old_end = rl_end;
+  rl_line_buffer[rl_end++] = ' ';
+  rl_line_buffer[rl_end] = '\0';
+
+  _rl_dispatch (c, _rl_keymap);
+
+  /* Remove the blank that we added. */
+  rl_end = old_end;
+  rl_line_buffer[rl_end] = '\0';
+  if (rl_point > rl_end)
+    rl_point = rl_end;
+
+  /* No change in position means the command failed. */
+  if (rl_mark == rl_point)
+    return (-1);
+
+  /* rl_vi_f[wW]ord () leaves the cursor on the first character of the next
+     word.  If we are not at the end of the line, and we are on a
+     non-whitespace character, move back one (presumably to whitespace). */
+  if ((_rl_to_upper (c) == 'W') && rl_point < rl_end && rl_point > rl_mark &&
+      !whitespace (rl_line_buffer[rl_point]))
+    rl_point--;
+
+  /* If cw or cW, back up to the end of a word, so the behaviour of ce
+     or cE is the actual result.  Brute-force, no subtlety. */
+  if (key == 'c' && rl_point >= rl_mark && (_rl_to_upper (c) == 'W'))
+    {
+      /* Don't move farther back than where we started. */
+      while (rl_point > rl_mark && whitespace (rl_line_buffer[rl_point]))
+	rl_point--;
+
+      /* Posix.2 says that if cw or cW moves the cursor towards the end of
+	 the line, the character under the cursor should be deleted. */
+      if (rl_point == rl_mark)
+        rl_point++;
+      else
+	{
+	  /* Move past the end of the word so that the kill doesn't
+	     remove the last letter of the previous word.  Only do this
+	     if we are not at the end of the line. */
+	  if (rl_point >= 0 && rl_point < (rl_end - 1) && !whitespace (rl_line_buffer[rl_point]))
+	    rl_point++;
+	}
+    }
+
+  if (rl_mark < rl_point)
+    SWAP (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? */
+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);
+      key = c = rl_read_key ();
+      RL_UNSETSTATE(RL_STATE_MOREINPUT);
+
+      if (c >= 0 && _rl_keymap[c].type == ISFUNC &&
+	  _rl_keymap[c].function == rl_universal_argument)
+	{
+	  rl_numeric_arg *= 4;
+	  continue;
+	}
+
+      c = UNMETA (c);
+      if (_rl_digit_p (c))
+	{
+	  if (rl_explicit_arg)
+	    rl_numeric_arg = (rl_numeric_arg * 10) + _rl_digit_value (c);
+	  else
+	    rl_numeric_arg = _rl_digit_value (c);
+	  rl_explicit_arg = 1;
+	}
+      else
+	{
+	  rl_clear_message ();
+	  rl_stuff_char (key);
+	  break;
+	}
+    }
+
+  RL_UNSETSTATE(RL_STATE_NUMERICARG);
+  return (0);
+}
+
+int
+rl_vi_delete_to (count, key)
+     int count, key;
+{
+  int c;
+
+  if (_rl_uppercase_p (key))
+    rl_stuff_char ('$');
+  else if (vi_redoing)
+    rl_stuff_char (_rl_vi_last_motion);
+
+  if (rl_vi_domove (key, &c))
+    {
+      rl_ding ();
+      return -1;
+    }
+
+  /* These are the motion commands that do not require adjusting the
+     mark. */
+  if ((strchr (" l|h^0bB", c) == 0) && (rl_mark < rl_end))
+    rl_mark++;
+
+  rl_kill_text (rl_point, rl_mark);
+  return (0);
+}
+
+int
+rl_vi_change_to (count, key)
+     int count, key;
+{
+  int c, start_pos;
+
+  if (_rl_uppercase_p (key))
+    rl_stuff_char ('$');
+  else if (vi_redoing)
+    rl_stuff_char (_rl_vi_last_motion);
+
+  start_pos = rl_point;
+
+  if (rl_vi_domove (key, &c))
+    {
+      rl_ding ();
+      return -1;
+    }
+
+  /* These are the motion commands that do not require adjusting the
+     mark.  c[wW] are handled by special-case code in rl_vi_domove(),
+     and already leave the mark at the correct location. */
+  if ((strchr (" l|hwW^0bB", c) == 0) && (rl_mark < rl_end))
+    rl_mark++;
+
+  /* The cursor never moves with c[wW]. */
+  if ((_rl_to_upper (c) == 'W') && rl_point < start_pos)
+    rl_point = start_pos;
+
+  if (vi_redoing)
+    {
+      if (vi_insert_buffer && *vi_insert_buffer)
+	rl_begin_undo_group ();
+      rl_delete_text (rl_point, rl_mark);
+      if (vi_insert_buffer && *vi_insert_buffer)
+	{
+	  rl_insert_text (vi_insert_buffer);
+	  rl_end_undo_group ();
+	}
+    }
+  else
+    {
+      rl_begin_undo_group ();		/* to make the `u' command work */
+      rl_kill_text (rl_point, rl_mark);
+      /* `C' does not save the text inserted for undoing or redoing. */
+      if (_rl_uppercase_p (key) == 0)
+        _rl_vi_doing_insert = 1;
+      _rl_vi_set_last (key, count, rl_arg_sign);
+      rl_vi_insertion_mode (1, key);
+    }
+
+  return (0);
+}
+
+int
+rl_vi_yank_to (count, key)
+     int count, key;
+{
+  int c, save = rl_point;
+
+  if (_rl_uppercase_p (key))
+    rl_stuff_char ('$');
+
+  if (rl_vi_domove (key, &c))
+    {
+      rl_ding ();
+      return -1;
+    }
+
+  /* These are the motion commands that do not require adjusting the
+     mark. */
+  if ((strchr (" l|h^0%bB", c) == 0) && (rl_mark < rl_end))
+    rl_mark++;
+
+  rl_begin_undo_group ();
+  rl_kill_text (rl_point, rl_mark);
+  rl_end_undo_group ();
+  rl_do_undo ();
+  rl_point = save;
+
+  return (0);
+}
+
+int
+rl_vi_delete (count, key)
+     int count, key;
+{
+  int end;
+
+  if (rl_end == 0)
+    {
+      rl_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;
+
+  if (end >= rl_end)
+    end = rl_end;
+
+  rl_kill_text (rl_point, end);
+  
+  if (rl_point > 0 && rl_point == rl_end)
+    rl_backward_char (1, key);
+  return (0);
+}
+
+int
+rl_vi_back_to_indent (count, key)
+     int count, key;
+{
+  rl_beg_of_line (1, key);
+  while (rl_point < rl_end && whitespace (rl_line_buffer[rl_point]))
+    rl_point++;
+  return (0);
+}
+
+int
+rl_vi_first_print (count, key)
+     int count, key;
+{
+  return (rl_vi_back_to_indent (1, key));
+}
+
+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 == ',')
+    dir = key == ';' ? orig_dir : -orig_dir;
+  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
+	}
+
+      switch (key)
+        {
+        case 't':
+          orig_dir = dir = FTO;
+          break;
+
+        case 'T':
+          orig_dir = dir = BTO;
+          break;
+
+        case 'f':
+          orig_dir = dir = FFIND;
+          break;
+
+        case 'F':
+          orig_dir = dir = BFIND;
+          break;
+        }
+    }
+
+#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 */
+int
+rl_vi_match (ignore, key)
+     int ignore, key;
+{
+  int count = 1, brack, pos, tmp, pre;
+
+  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);
+
+      if (brack <= 0)
+	{
+	  rl_point = pos;
+	  rl_ding ();
+	  return -1;
+	}
+    }
+
+  pos = rl_point;
+
+  if (brack < 0)
+    {
+      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)
+	    {
+	      int b = rl_vi_bracktype (rl_line_buffer[pos]);
+	      if (b == -brack)
+		count--;
+	      else if (b == brack)
+		count++;
+	    }
+	  else
+	    {
+	      rl_ding ();
+	      return -1;
+	    }
+	}
+    }
+  else
+    {			/* 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)
+	    {
+	      int b = rl_vi_bracktype (rl_line_buffer[pos]);
+	      if (b == -brack)
+		count--;
+	      else if (b == brack)
+		count++;
+	    }
+	  else
+	    {
+	      rl_ding ();
+	      return -1;
+	    }
+	}
+    }
+  rl_point = pos;
+  return (0);
+}
+
+int
+rl_vi_bracktype (c)
+     int c;
+{
+  switch (c)
+    {
+    case '(': return  1;
+    case ')': return -1;
+    case '[': return  2;
+    case ']': return -2;
+    case '{': return  3;
+    case '}': return -3;
+    default:  return  0;
+    }
+}
+
+/* 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;
+{
+  int c;
+
+  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);
+    }
+
+  if (c == '\033' || c == CTRL ('C'))
+    return -1;
+
+  while (count-- && rl_point < rl_end)
+    {
+      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);
+      if (count == 0)
+	rl_backward_char (1, c);
+
+      rl_end_undo_group ();
+    }
+  return (0);
+}
+
+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 ' */
+
+  return (rl_vi_change_to (count, 'c'));
+}
+
+int
+rl_vi_overstrike (count, key)
+     int count, key;
+{
+  if (_rl_vi_doing_insert == 0)
+    {
+      _rl_vi_doing_insert = 1;
+      rl_begin_undo_group ();
+    }
+
+  if (count > 0)
+    {
+      _rl_overwrite_char (count, key);
+      vi_replace_count += count;
+    }
+
+  return (0);
+}
+
+int
+rl_vi_overstrike_delete (count, key)
+     int count, key;
+{
+  int i, s;
+
+  for (i = 0; i < count; i++)
+    {
+      if (vi_replace_count == 0)
+	{
+	  rl_ding ();
+	  break;
+	}
+      s = rl_point;
+
+      if (rl_do_undo ())
+	vi_replace_count--;
+
+      if (rl_point == s)
+	rl_backward_char (1, key);
+    }
+
+  if (vi_replace_count == 0 && _rl_vi_doing_insert)
+    {
+      rl_end_undo_group ();
+      rl_do_undo ();
+      _rl_vi_doing_insert = 0;
+    }
+  return (0);
+}
+
+int
+rl_vi_replace (count, key)
+     int count, key;
+{
+  int i;
+
+  vi_replace_count = 0;
+
+  if (!vi_replace_map)
+    {
+      vi_replace_map = rl_make_bare_keymap ();
+
+      for (i = ' '; i < KEYMAP_SIZE; i++)
+	vi_replace_map[i].function = rl_vi_overstrike;
+
+      vi_replace_map[RUBOUT].function = rl_vi_overstrike_delete;
+      vi_replace_map[ESC].function = rl_vi_movement_mode;
+      vi_replace_map[RETURN].function = rl_newline;
+      vi_replace_map[NEWLINE].function = rl_newline;
+
+      /* If the normal vi insertion keymap has ^H bound to erase, do the
+         same here.  Probably should remove the assignment to RUBOUT up
+         there, but I don't think it will make a difference in real life. */
+      if (vi_insertion_keymap[CTRL ('H')].type == ISFUNC &&
+	  vi_insertion_keymap[CTRL ('H')].function == rl_rubout)
+	vi_replace_map[CTRL ('H')].function = rl_vi_overstrike_delete;
+
+    }
+  _rl_keymap = vi_replace_map;
+  return (0);
+}
+
+#if 0
+/* Try to complete the word we are standing on or the word that ends with
+   the previous character.  A space matches everything.  Word delimiters are
+   space and ;. */
+int
+rl_vi_possible_completions()
+{
+  int save_pos = rl_point;
+
+  if (rl_line_buffer[rl_point] != ' ' && rl_line_buffer[rl_point] != ';')
+    {
+      while (rl_point < rl_end && rl_line_buffer[rl_point] != ' ' &&
+	     rl_line_buffer[rl_point] != ';')
+	rl_point++;
+    }
+  else if (rl_line_buffer[rl_point - 1] == ';')
+    {
+      rl_ding ();
+      return (0);
+    }
+
+  rl_possible_completions ();
+  rl_point = save_pos;
+
+  return (0);
+}
+#endif
+
+/* Functions to save and restore marks. */
+int
+rl_vi_set_mark (count, key)
+     int count, key;
+{
+  int ch;
+
+  RL_SETSTATE(RL_STATE_MOREINPUT);
+  ch = rl_read_key ();
+  RL_UNSETSTATE(RL_STATE_MOREINPUT);
+
+  if (ch < 'a' || ch > 'z')
+    {
+      rl_ding ();
+      return -1;
+    }
+  ch -= 'a';
+  vi_mark_chars[ch] = rl_point;
+  return 0;
+}
+
+int
+rl_vi_goto_mark (count, key)
+     int 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')
+    {
+      rl_ding ();
+      return -1;
+    }
+
+  ch -= 'a';
+  if (vi_mark_chars[ch] == -1)
+    {
+      rl_ding ();
+      return -1;
+    }
+  rl_point = vi_mark_chars[ch];
+  return 0;
+}
+
+#endif /* VI_MODE */