[target/generic]: preliminary 2.6.38 support

[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..eeadfab 100644 (file)
--- a/package/busybox/config/editors/Config.in
+++ b/package/busybox/config/editors/Config.in
@@ -9,17 +9,10 @@ config BUSYBOX_CONFIG_AWK
        bool "awk"
        default y
        help
        bool "awk"
        default y
        help

-         Awk is used as a pattern scanning and processing language.  This is
+         Awk is used as a pattern scanning and processing language. This is

          the BusyBox implementation of that programming language.
 
          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
+config BUSYBOX_CONFIG_FEATURE_AWK_LIBM

        bool "Enable math functions (requires libm)"
        default y
        depends on BUSYBOX_CONFIG_AWK
        bool "Enable math functions (requires libm)"
        default y
        depends on BUSYBOX_CONFIG_AWK


@@ -42,13 +35,12 @@ config BUSYBOX_CONFIG_DIFF
          differences between them in a form that can be given to
          the patch command.
 
          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"


@@ -58,20 +50,12 @@ 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
        help
          The original 1970's Unix text editor, from the days of teletypes.
 config BUSYBOX_CONFIG_ED
        bool "ed"
        default n
        help
          The original 1970's Unix text editor, from the days of teletypes.

-         Small, simple, evil.  Part of SUSv3.  If you're not already using
+         Small, simple, evil. Part of SUSv3. If you're not already using

          this, you don't need it.
 
 config BUSYBOX_CONFIG_PATCH
          this, you don't need it.
 
 config BUSYBOX_CONFIG_PATCH


@@ -91,27 +75,36 @@ config BUSYBOX_CONFIG_VI
        bool "vi"
        default y
        help
        bool "vi"
        default y
        help

-         'vi' is a text editor.  More specifically, it is the One True
-         text editor <grin>.  It does, however, have a rather steep
-         learning curve.  If you are not already comfortable with 'vi'
+         'vi' is a text editor. More specifically, it is the One True
+         text editor <grin>. It does, however, have a rather steep
+         learning curve. If you are not already comfortable with '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)"
        default y
        depends on BUSYBOX_CONFIG_VI
        help
 
 config BUSYBOX_CONFIG_FEATURE_VI_COLON
        bool "Enable \":\" colon commands (no \"ex\" mode)"
        default y
        depends on BUSYBOX_CONFIG_VI
        help

-         Enable a limited set of colon commands for vi.  This does not
+         Enable a limited set of colon commands for vi. This does not

          provide an "ex" mode.
 
 config BUSYBOX_CONFIG_FEATURE_VI_YANKMARK
          provide an "ex" mode.
 
 config BUSYBOX_CONFIG_FEATURE_VI_YANKMARK


@@ -135,7 +128,7 @@ config BUSYBOX_CONFIG_FEATURE_VI_USE_SIGNALS
        default y
        depends on BUSYBOX_CONFIG_VI
        help
        default y
        depends on BUSYBOX_CONFIG_VI
        help

-         Selecting this option will make busybox vi signal aware.  This will
+         Selecting this option will make busybox vi signal aware. This will

          make busybox vi support SIGWINCH to deal with Window Changes, catch
          Ctrl-Z and Ctrl-C and alarms.
 
          make busybox vi support SIGWINCH to deal with Window Changes, catch
          Ctrl-Z and Ctrl-C and alarms.
 


@@ -175,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