X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=readline%2Fvi_keymap.c;h=ba5a27ba6df14a1ed2922377a1880d592345078f;hb=7903e5309890633911c91539e23a407e1f74b959;hp=53a67c674ce0c1fa90e3cc28d593d0b036a833cb;hpb=84041b4c47edb0461f3b82afb77ca2d81819ebfa;p=deliverable%2Fbinutils-gdb.git

diff --git a/readline/vi_keymap.c b/readline/vi_keymap.c
index 53a67c674c..ba5a27ba6d 100644
--- a/readline/vi_keymap.c
+++ b/readline/vi_keymap.c
@@ -1,24 +1,23 @@
 /* vi_keymap.c -- the keymap for vi_mode in readline (). */
 
-/* Copyright (C) 1987, 1989, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2009 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.
+   This file is part of the GNU Readline Library (Readline), 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
+   Readline 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 3 of the License, 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
+   Readline 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. */
+   You should have received a copy of the GNU General Public License
+   along with Readline.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #if !defined (BUFSIZ)
 #include <stdio.h>
@@ -130,7 +129,7 @@ KEYMAP_ENTRY_ARRAY vi_movement_keymap = {
   { ISFUNC, rl_revert_line },			/* U */
   { ISFUNC, (rl_command_func_t *)0x0 },		/* V */
   { ISFUNC, rl_vi_next_word },			/* W */
-  { ISFUNC, rl_rubout },			/* X */
+  { ISFUNC, rl_vi_rubout },			/* X */
   { ISFUNC, rl_vi_yank_to },			/* Y */
   { ISFUNC, (rl_command_func_t *)0x0 },		/* Z */
 
@@ -151,7 +150,7 @@ KEYMAP_ENTRY_ARRAY vi_movement_keymap = {
   { ISFUNC, rl_vi_char_search },		/* f */
   { ISFUNC, (rl_command_func_t *)0x0 },		/* g */
   { ISFUNC, rl_backward_char },			/* h */
-  { ISFUNC, rl_vi_insertion_mode },		/* i */
+  { ISFUNC, rl_vi_insert_mode },		/* i */
   { ISFUNC, rl_get_next_history },		/* j */
   { ISFUNC, rl_get_previous_history },		/* k */
   { ISFUNC, rl_forward_char },			/* l */
@@ -327,9 +326,9 @@ KEYMAP_ENTRY_ARRAY vi_insertion_keymap = {
   { ISFUNC, rl_insert },			/* Control-k */
   { ISFUNC, rl_insert },			/* Control-l */
   { ISFUNC, rl_newline },			/* Control-m */
-  { ISFUNC, rl_insert },			/* Control-n */
+  { ISFUNC, rl_menu_complete},			/* Control-n */
   { ISFUNC, rl_insert },			/* Control-o */
-  { ISFUNC, rl_insert },			/* Control-p */
+  { ISFUNC, rl_backward_menu_complete },	/* Control-p */
   { ISFUNC, rl_insert },			/* Control-q */
   { ISFUNC, rl_reverse_search_history },	/* Control-r */
   { ISFUNC, rl_forward_search_history },	/* Control-s */