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 8973c36..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.
 
-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
@@ -27,6 +20,45 @@ config BUSYBOX_CONFIG_FEATURE_AWK_MATH
          Enable math functions of the Awk programming language.
          NOTE: This will require libm to be present for linking.
 
+config BUSYBOX_CONFIG_CMP
+       bool "cmp"
+       default n
+       help
+         cmp is used to compare two files and returns the result
+         to standard output.
+
+config BUSYBOX_CONFIG_DIFF
+       bool "diff"
+       default y
+       help
+         diff compares two files or directories and outputs the
+         differences between them in a form that can be given to
+         the patch command.
+
+config BUSYBOX_CONFIG_FEATURE_DIFF_BINARY
+       bool "Enable checks for binary files"
+       default n
+       depends on BUSYBOX_CONFIG_DIFF
+       help
+         This option enables support for checking for binary files
+         before a comparison is carried out.
+
+config BUSYBOX_CONFIG_FEATURE_DIFF_DIR
+       bool "Enable directory support"
+       default n
+       depends on BUSYBOX_CONFIG_DIFF
+       help
+         This option enables support for directory and subdirectory
+         comparison.
+
+config BUSYBOX_CONFIG_FEATURE_DIFF_MINIMAL
+       bool "Enable -d option to find smaller sets of changes"
+       default n
+       depends on BUSYBOX_CONFIG_DIFF
+       help
+         Enabling this option allows the use of -d to make diff
+         try hard to find the smallest possible set of changes.
+
 config BUSYBOX_CONFIG_ED
        bool "ed"
        default n
@@ -57,6 +89,25 @@ config BUSYBOX_CONFIG_VI
          learning curve.  If you are not already comfortable with 'vi'
          you may wish to use something else.
 
+config BUSYBOX_CONFIG_FEATURE_VI_MAX_LEN
+       int "Maximum screen width in vi"
+       range 256 16384
+       default 1024
+       depends on BUSYBOX_CONFIG_VI
+       help
+         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)"
        default y