eliminated CONFIG_FEATURE_EDITING_FANCY_KEYS. the size savings

was small, compared to the total size of the command-line editing
features, and it removed key bindings that most wouldn't consider
"fancy", like ^U, and 'l' and 'h' in vi mode, ^F and ^B in emacs
mode.

diff --git a/libbb/Config.in b/libbb/Config.in
index 6bbeffb431448be1fd80668a80d5890017291372..0ad4381d9098a1ca6c3404d682176e7b3e7e84f5 100644 (file)
--- a/libbb/Config.in
+++ b/libbb/Config.in
@@ -57,14 +57,6 @@ config FEATURE_EDITING_MAX_LEN
          You may want to decrease this parameter if your target machine
          benefits from smaller stack usage.
 
-config FEATURE_EDITING_FANCY_KEYS
-       bool "Additional editing keys"
-       default n
-       depends on FEATURE_EDITING
-       help
-         Enable additonal editing keys (Ctrl-E, Ctrl-U etc).
-         Arrow keys, Home/End/Delete and Ctrl-W work even without this option.
-
 config FEATURE_EDITING_VI
        bool "vi-style line editing commands"
        default n

diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index cbe2bb9164115c68f3f08eebe8158bc060f3022d..d3ee7386e2eeedbec35bedc614170d35f00419c2 100644 (file)
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1423,7 +1423,6 @@ int read_line_input(const char *prompt, char *command, int maxsize, line_input_t
                        goto_new_line();
                        break_out = 1;
                        break;
-#if ENABLE_FEATURE_EDITING_FANCY_KEYS
                case CTRL('A'):
                vi_case('0'|vbit:)
                        /* Control-a -- Beginning of line */
@@ -1436,7 +1435,6 @@ int read_line_input(const char *prompt, char *command, int maxsize, line_input_t
                        /* Control-b -- Move back one character */
                        input_backward(1);
                        break;
-#endif
                case CTRL('C'):
                vi_case(CTRL('C')|vbit:)
                        /* Control-c -- stop gathering input */
@@ -1457,7 +1455,6 @@ int read_line_input(const char *prompt, char *command, int maxsize, line_input_t
                        input_delete(0);
                        break;
 
-#if ENABLE_FEATURE_EDITING_FANCY_KEYS
                case CTRL('E'):
                vi_case('$'|vbit:)
                        /* Control-e -- End of line */
@@ -1469,7 +1466,6 @@ int read_line_input(const char *prompt, char *command, int maxsize, line_input_t
                        /* Control-f -- Move forward one character */
                        input_forward();
                        break;
-#endif
 
                case '\b':
                case '\x7f': /* DEL */
@@ -1483,7 +1479,6 @@ int read_line_input(const char *prompt, char *command, int maxsize, line_input_t
                        break;
 #endif
 
-#if ENABLE_FEATURE_EDITING_FANCY_KEYS
                case CTRL('K'):
                        /* Control-k -- clear to end of line */
                        command[cursor] = 0;
@@ -1496,7 +1491,6 @@ int read_line_input(const char *prompt, char *command, int maxsize, line_input_t
                        printf("\033[H");
                        redraw(0, command_len - cursor);
                        break;
-#endif
 
 #if MAX_HISTORY > 0
                case CTRL('N'):
@@ -1518,7 +1512,6 @@ int read_line_input(const char *prompt, char *command, int maxsize, line_input_t
                        break;
 #endif
 
-#if ENABLE_FEATURE_EDITING_FANCY_KEYS
                case CTRL('U'):
                vi_case(CTRL('U')|vbit:)
                        /* Control-U -- Clear line before cursor */
@@ -1528,7 +1521,6 @@ int read_line_input(const char *prompt, char *command, int maxsize, line_input_t
                                redraw(cmdedit_y, command_len);
                        }
                        break;
-#endif
                case CTRL('W'):
                vi_case(CTRL('W')|vbit:)
                        /* Control-W -- Remove the last word */

diff --git a/scripts/defconfig b/scripts/defconfig
index a38a511e4e44b209423a2d5c4b31117f5b1b0381..109af65101ae50cbe1c6fbdfe22639f090b15219 100644 (file)
--- a/scripts/defconfig
+++ b/scripts/defconfig
@@ -73,7 +73,6 @@ CONFIG_FEATURE_FAST_TOP=y
 # CONFIG_FEATURE_ETC_NETWORKS is not set
 CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE_EDITING_MAX_LEN=1024
-# CONFIG_FEATURE_EDITING_FANCY_KEYS is not set
 # CONFIG_FEATURE_EDITING_VI is not set
 CONFIG_FEATURE_EDITING_HISTORY=15
 # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set