[package] resolveip: fix whitespace

[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 9eb85bb..894626f 100644 (file)
--- a/package/busybox/config/editors/Config.in
+++ b/package/busybox/config/editors/Config.in
@@ -5,6 +5,12 @@
 
 menu "Editors"
 
 
 menu "Editors"
 

+config BUSYBOX_CONFIG_PATCH
+       bool "patch"
+       default n
+       help
+         Apply a unified diff formatted patch.
+

 config BUSYBOX_CONFIG_AWK
        bool "awk"
        default y
 config BUSYBOX_CONFIG_AWK
        bool "awk"
        default y


@@ -22,26 +28,25 @@ config BUSYBOX_CONFIG_FEATURE_AWK_LIBM
 
 config BUSYBOX_CONFIG_CMP
        bool "cmp"
 
 config BUSYBOX_CONFIG_CMP
        bool "cmp"

-       default n
+       default y

        help
          cmp is used to compare two files and returns the result
          to standard output.
 
 config BUSYBOX_CONFIG_DIFF
        bool "diff"
        help
          cmp is used to compare two files and returns the result
          to standard output.
 
 config BUSYBOX_CONFIG_DIFF
        bool "diff"

-       default y
+       default n

        help
          diff compares two files or directories and outputs the
          differences between them in a form that can be given to
          the patch command.
 
        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"
+config BUSYBOX_CONFIG_FEATURE_DIFF_LONG_OPTIONS
+       bool "Enable long options"

        default n
        default n

-       depends on BUSYBOX_CONFIG_DIFF
+       depends on BUSYBOX_CONFIG_DIFF && BUSYBOX_CONFIG_LONG_OPTS

        help
        help

-         This option enables support for checking for binary files
-         before a comparison is carried out.
+         Enable use of long options.

 
 config BUSYBOX_CONFIG_FEATURE_DIFF_DIR
        bool "Enable directory support"
 
 config BUSYBOX_CONFIG_FEATURE_DIFF_DIR
        bool "Enable directory support"


@@ -51,14 +56,6 @@ config BUSYBOX_CONFIG_FEATURE_DIFF_DIR
          This option enables support for directory and subdirectory
          comparison.
 
          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
 config BUSYBOX_CONFIG_ED
        bool "ed"
        default n


@@ -67,12 +64,6 @@ config BUSYBOX_CONFIG_ED
          Small, simple, evil. Part of SUSv3. If you're not already using
          this, you don't need it.
 
          Small, simple, evil. Part of SUSv3. If you're not already using
          this, you don't need it.
 

-config BUSYBOX_CONFIG_PATCH
-       bool "patch"
-       default n
-       help
-         Apply a unified diff formatted patch.
-

 config BUSYBOX_CONFIG_SED
        bool "sed"
        default y
 config BUSYBOX_CONFIG_SED
        bool "sed"
        default y


@@ -177,6 +168,18 @@ config BUSYBOX_CONFIG_FEATURE_VI_WIN_RESIZE
        help
          Make busybox vi behave nicely with terminals that get resized.
 
        help
          Make busybox vi behave nicely with terminals that get resized.
 

+config BUSYBOX_CONFIG_FEATURE_VI_ASK_TERMINAL
+       bool "Use 'tell me cursor position' ESC sequence to measure window"
+       default y
+       depends on BUSYBOX_CONFIG_VI
+       help
+         If terminal size can't be retrieved and $LINES/$COLUMNS are not set,
+         this option makes vi perform a last-ditch effort to find it:
+         vi positions cursor to 999,999 and asks terminal to report real
+         cursor position using "ESC [ 6 n" escape sequence, then reads stdin.
+
+         This is not clean but helps a lot on serial lines and such.
+

 config BUSYBOX_CONFIG_FEATURE_VI_OPTIMIZE_CURSOR
        bool "Optimize cursor movement"
        default y
 config BUSYBOX_CONFIG_FEATURE_VI_OPTIMIZE_CURSOR
        bool "Optimize cursor movement"
        default y