From 6cfb737685912925470fa89e0e084c2b49e40c81 Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Sat, 29 Jul 2017 10:25:02 +0100 Subject: lineedit: fix incorrect conflict resolution in bb8d79ead merge --- libbb/lineedit.c | 38 -------------------------------------- 1 file changed, 38 deletions(-) (limited to 'libbb') diff --git a/libbb/lineedit.c b/libbb/lineedit.c index a93e28975..051a39b2e 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c @@ -2724,44 +2724,6 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman vi_cmdmode = 1; input_backward(1); } - /* Handle a few ESC- combinations the same way - * standard readline bindings (IOW: bash) do. - * Often, Alt- generates ESC-. - */ - ic = lineedit_read_key(read_key_buffer, 20); - switch (ic) { - //case KEYCODE_LEFT: - bash doesn't do this - case 'b': - ctrl_left(); - break; - //case KEYCODE_RIGHT: - bash doesn't do this - case 'f': - ctrl_right(); - break; - //case KEYCODE_DELETE: - bash doesn't do this - case 'd': /* Alt-D */ - { - /* Delete word forward */ - int nc, sc = cursor; - ctrl_right(); - nc = cursor - sc; - input_backward(nc); - while (--nc >= 0) - input_delete(1); - break; - } - case '\b': /* Alt-Backspace(?) */ - case '\x7f': /* Alt-Backspace(?) */ - //case 'w': - bash doesn't do this - { - /* Delete word backward */ - int sc = cursor; - ctrl_left(); - while (sc-- > cursor) - input_delete(1); - break; - } - } break; #endif /* FEATURE_COMMAND_EDITING_VI */ -- cgit v1.2.3-55-g6feb