Imported from ../bash-2.04.tar.gz.

[platform/upstream/bash.git] / lib / readline / emacs_keymap.c

diff --git a/lib/readline/emacs_keymap.c b/lib/readline/emacs_keymap.c
index 849d85f..daba213 100644 (file)
--- a/lib/readline/emacs_keymap.c
+++ b/lib/readline/emacs_keymap.c
@@ -7,7 +7,7 @@
 
    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 1, or
+   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
@@ -18,7 +18,7 @@
    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,
-   675 Mass Ave, Cambridge, MA 02139, USA. */
+   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 
 #if !defined (BUFSIZ)
 #include <stdio.h>
@@ -33,7 +33,7 @@
 KEYMAP_ENTRY_ARRAY emacs_standard_keymap = {
 
   /* Control keys. */
-  { ISFUNC, (Function *)0x0 },         /* Control-@ */
+  { ISFUNC, rl_set_mark },             /* Control-@ */
   { ISFUNC, rl_beg_of_line },          /* Control-a */
   { ISFUNC, rl_backward },             /* Control-b */
   { ISFUNC, (Function *)0x0 },         /* Control-c */
@@ -62,7 +62,7 @@ KEYMAP_ENTRY_ARRAY emacs_standard_keymap = {
   { ISFUNC, (Function *)0x0 },         /* Control-z */
   { ISKMAP, (Function *)emacs_meta_keymap }, /* Control-[ */
   { ISFUNC, (Function *)0x0 },         /* Control-\ */
-  { ISFUNC, (Function *)0x0 },         /* Control-] */
+  { ISFUNC, rl_char_search },          /* Control-] */
   { ISFUNC, (Function *)0x0 },         /* Control-^ */
   { ISFUNC, rl_undo_command },         /* Control-_ */
 
@@ -76,11 +76,7 @@ KEYMAP_ENTRY_ARRAY emacs_standard_keymap = {
   { ISFUNC, rl_insert },       /* & */
   { ISFUNC, rl_insert },       /* ' */
   { ISFUNC, rl_insert },       /* ( */
-#if defined (PAREN_MATCHING)
-  { ISFUNC, rl_insert_close }, /* ) */
-#else
   { ISFUNC, rl_insert },       /* ) */
-#endif /* !PAREN_MATCHING */
   { ISFUNC, rl_insert },       /* * */
   { ISFUNC, rl_insert },       /* + */
   { ISFUNC, rl_insert },       /* , */
@@ -140,11 +136,7 @@ KEYMAP_ENTRY_ARRAY emacs_standard_keymap = {
   /* Some more punctuation. */
   { ISFUNC, rl_insert },       /* [ */
   { ISFUNC, rl_insert },       /* \ */
-#if defined (PAREN_MATCHING)
-  { ISFUNC, rl_insert_close }, /* ] */
-#else
   { ISFUNC, rl_insert },       /* ] */
-#endif /* !PAREN_MATCHING */
   { ISFUNC, rl_insert },       /* ^ */
   { ISFUNC, rl_insert },       /* _ */
   { ISFUNC, rl_insert },       /* ` */
@@ -180,11 +172,7 @@ KEYMAP_ENTRY_ARRAY emacs_standard_keymap = {
   /* Final punctuation. */
   { ISFUNC, rl_insert },       /* { */
   { ISFUNC, rl_insert },       /* | */
-#if defined (PAREN_MATCHING)
-  { ISFUNC, rl_insert_close }, /* } */
-#else
   { ISFUNC, rl_insert },       /* } */
-#endif /* !PAREN_MATCHING */
   { ISFUNC, rl_insert },       /* ~ */
   { ISFUNC, rl_rubout },       /* RUBOUT */
 
@@ -358,22 +346,22 @@ KEYMAP_ENTRY_ARRAY emacs_meta_keymap = {
 
   { ISFUNC, rl_complete },     /* Meta-Control-[ */
   { ISFUNC, (Function *)0x0 }, /* Meta-Control-\ */
-  { ISFUNC, (Function *)0x0 }, /* Meta-Control-] */
+  { ISFUNC, rl_backward_char_search }, /* Meta-Control-] */
   { ISFUNC, (Function *)0x0 }, /* Meta-Control-^ */
   { ISFUNC, (Function *)0x0 }, /* Meta-Control-_ */
 
   /* The start of printing characters. */
-  { ISFUNC, (Function *)0x0 }, /* Meta-SPACE */
+  { ISFUNC, rl_set_mark },     /* Meta-SPACE */
   { ISFUNC, (Function *)0x0 }, /* Meta-! */
   { ISFUNC, (Function *)0x0 }, /* Meta-" */
-  { ISFUNC, (Function *)0x0 }, /* Meta-# */
+  { ISFUNC, rl_insert_comment },/* Meta-# */
   { ISFUNC, (Function *)0x0 }, /* Meta-$ */
   { ISFUNC, (Function *)0x0 }, /* Meta-% */
   { ISFUNC, rl_tilde_expand }, /* Meta-& */
   { ISFUNC, (Function *)0x0 }, /* Meta-' */
   { ISFUNC, (Function *)0x0 }, /* Meta-( */
   { ISFUNC, (Function *)0x0 }, /* Meta-) */
-  { ISFUNC, (Function *)0x0 }, /* Meta-* */
+  { ISFUNC, rl_insert_completions },   /* Meta-* */
   { ISFUNC, (Function *)0x0 }, /* Meta-+ */
   { ISFUNC, (Function *)0x0 }, /* Meta-, */
   { ISFUNC, rl_digit_argument }, /* Meta-- */
@@ -396,7 +384,7 @@ KEYMAP_ENTRY_ARRAY emacs_meta_keymap = {
   { ISFUNC, (Function *)0x0 },         /* Meta-: */
   { ISFUNC, (Function *)0x0 },         /* Meta-; */
   { ISFUNC, rl_beginning_of_history }, /* Meta-< */
-  { ISFUNC, (Function *)0x0 },         /* Meta-= */
+  { ISFUNC, rl_possible_completions }, /* Meta-= */
   { ISFUNC, rl_end_of_history },       /* Meta-> */
   { ISFUNC, rl_possible_completions }, /* Meta-? */
   { ISFUNC, (Function *)0x0 },         /* Meta-@ */
@@ -632,7 +620,7 @@ KEYMAP_ENTRY_ARRAY emacs_ctlx_keymap = {
   { ISFUNC, rl_undo_command },         /* Control-u */
   { ISFUNC, (Function *)0x0 },         /* Control-v */
   { ISFUNC, (Function *)0x0 },         /* Control-w */
-  { ISFUNC, (Function *)0x0 },         /* Control-x */
+  { ISFUNC, rl_exchange_point_and_mark },/* Control-x */
   { ISFUNC, (Function *)0x0 },         /* Control-y */
   { ISFUNC, (Function *)0x0 },         /* Control-z */
   { ISFUNC, (Function *)0x0 },         /* Control-[ */