remove awx from busybox, refresh patches

[openwrt.git] / package / busybox / config / editors / Config.in

diff --git a/package/busybox/config/editors/Config.in b/package/busybox/config/editors/Config.in
index 6d1f6f2..4f69381 100644 (file)
--- a/package/busybox/config/editors/Config.in
+++ b/package/busybox/config/editors/Config.in
@@ -12,13 +12,6 @@ config BUSYBOX_CONFIG_AWK
          Awk is used as a pattern scanning and processing language.  This is
          the BusyBox implementation of that programming language.
 
          Awk is used as a pattern scanning and processing language.  This is
          the BusyBox implementation of that programming language.
 

-config BUSYBOX_CONFIG_AWX
-       bool "Enable awx (awk web extension)"
-       default y
-       depends on BUSYBOX_CONFIG_AWK
-       help
-         awx - awk web extension
-

 config BUSYBOX_CONFIG_FEATURE_AWK_MATH
        bool "Enable math functions (requires libm)"
        default y
 config BUSYBOX_CONFIG_FEATURE_AWK_MATH
        bool "Enable math functions (requires libm)"
        default y


@@ -97,14 +90,23 @@ config BUSYBOX_CONFIG_VI
          you may wish to use something else.
 
 config BUSYBOX_CONFIG_FEATURE_VI_MAX_LEN
          you may wish to use something else.
 
 config BUSYBOX_CONFIG_FEATURE_VI_MAX_LEN

-       int "Maximum line length in vi"
+       int "Maximum screen width in vi"

        range 256 16384
        default 1024
        depends on BUSYBOX_CONFIG_VI
        help
        range 256 16384
        default 1024
        depends on BUSYBOX_CONFIG_VI
        help

-         vi uses on-stack buffers for intermediate line buffers.
-         You may want to decrease this parameter if your target machine
-         benefits from smaller stack usage.
+         Contrary to what you may think, this is not eating much.
+         Make it smaller than 4k only if you are very limited on memory.
+
+config BUSYBOX_CONFIG_FEATURE_VI_8BIT
+       bool "Allow vi to display 8-bit chars (otherwise shows dots)"
+       default n
+       depends on BUSYBOX_CONFIG_VI
+       help
+         If your terminal can display characters with high bit set,
+         you may want to enable this. Note: vi is not Unicode-capable.
+         If your terminal combines several 8-bit bytes into one character
+         (as in Unicode mode), this will not work properly.

 
 config BUSYBOX_CONFIG_FEATURE_VI_COLON
        bool "Enable \":\" colon commands (no \"ex\" mode)"
 
 config BUSYBOX_CONFIG_FEATURE_VI_COLON
        bool "Enable \":\" colon commands (no \"ex\" mode)"