Reverted r22488 and part of r23783. This makes the backspace key work

again in the shell.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26025 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/bin/bash/lib/readline/emacs_keymap.c

@@ -174,7 +174,7 @@ KEYMAP_ENTRY_ARRAY emacs_standard_keymap = {
   { ISFUNC, rl_insert },		/* | */
   { ISFUNC, rl_insert },		/* } */
   { ISFUNC, rl_insert },		/* ~ */
-  { ISFUNC, rl_delete },		/* RUBOUT */
+  { ISFUNC, rl_rubout },		/* RUBOUT */
 
 #if KEYMAP_SIZE > 128
   /* Pure 8-bit characters (128 - 159).

src/bin/bash/lib/readline/keymaps.c

@@ -105,7 +105,7 @@ rl_make_keymap ()
     newmap[i].function = rl_insert;
 
   newmap[TAB].function = rl_insert;
-  newmap[RUBOUT].function = rl_delete;	/* RUBOUT == 127 */
+  newmap[RUBOUT].function = rl_rubout;	/* RUBOUT == 127 */
   newmap[CTRL('H')].function = rl_rubout;
 
 #if KEYMAP_SIZE > 128

src/bin/bash/lib/readline/readline.c

@@ -885,23 +885,12 @@ bind_arrow_keys_internal (map)
   _rl_keymap = xkeymap;
 }
 
-/* Bind some default keys in the standard keymap. */
-static void
-bind_default_keys_internal ()
-{
-  _rl_bind_if_unbound ("\033[[", rl_end_of_line);
-  _rl_bind_if_unbound ("\033[@", rl_beg_of_line);
-  _rl_bind_if_unbound ("\033[5~", rl_history_search_backward);
-  _rl_bind_if_unbound ("\033[6~", rl_history_search_forward);
-}
-
 /* Try and bind the common arrow key prefixes after giving termcap and
    the inputrc file a chance to bind them and create `real' keymaps
    for the arrow key prefix. */
 static void
 bind_arrow_keys ()
 {
-  bind_default_keys_internal ();
   bind_arrow_keys_internal (emacs_standard_keymap);
 
 #if defined (VI_MODE)