svn commit: trunk/busybox: libbb scripts

[pgf at busybox.net]

Author: pgf
Date: 2008-01-18 12:41:24 -0800 (Fri, 18 Jan 2008)
New Revision: 20875

Log:
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.


Modified:
   trunk/busybox/libbb/Config.in
   trunk/busybox/libbb/lineedit.c
   trunk/busybox/scripts/defconfig


Changeset:
Modified: trunk/busybox/libbb/Config.in
===================================================================
--- trunk/busybox/libbb/Config.in	2008-01-18 16:21:35 UTC (rev 20874)
+++ trunk/busybox/libbb/Config.in	2008-01-18 20:41:24 UTC (rev 20875)
@@ -57,14 +57,6 @@
 	  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

Modified: trunk/busybox/libbb/lineedit.c
===================================================================
--- trunk/busybox/libbb/lineedit.c	2008-01-18 16:21:35 UTC (rev 20874)
+++ trunk/busybox/libbb/lineedit.c	2008-01-18 20:41:24 UTC (rev 20875)
@@ -1423,7 +1423,6 @@
 			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 @@
 			/* 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 @@
 			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 @@
 			/* Control-f -- Move forward one character */
 			input_forward();
 			break;
-#endif
 
 		case '\b':
 		case '\x7f': /* DEL */
@@ -1483,7 +1479,6 @@
 			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 @@
 			printf("\033[H");
 			redraw(0, command_len - cursor);
 			break;
-#endif
 
 #if MAX_HISTORY > 0
 		case CTRL('N'):
@@ -1518,7 +1512,6 @@
 			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 @@
 				redraw(cmdedit_y, command_len);
 			}
 			break;
-#endif
 		case CTRL('W'):
 		vi_case(CTRL('W')|vbit:)
 			/* Control-W -- Remove the last word */

Modified: trunk/busybox/scripts/defconfig
===================================================================
--- trunk/busybox/scripts/defconfig	2008-01-18 16:21:35 UTC (rev 20874)
+++ trunk/busybox/scripts/defconfig	2008-01-18 20:41:24 UTC (rev 20875)
@@ -73,7 +73,6 @@
 # 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