X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/f4f4212c8a84f60f821d662b93b7aacc971b1885..3bbfe4ce1ffcd1cf1509badf5b2e2176b4959e75:/package/busybox/config/editors/Config.in

diff --git a/package/busybox/config/editors/Config.in b/package/busybox/config/editors/Config.in
index 6844049d7..9eb85bbb8 100644
--- a/package/busybox/config/editors/Config.in
+++ b/package/busybox/config/editors/Config.in
@@ -9,10 +9,10 @@ config BUSYBOX_CONFIG_AWK
 	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.
 
-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
@@ -20,12 +20,51 @@ 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
 	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
@@ -45,17 +84,36 @@ config BUSYBOX_CONFIG_VI
 	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
+	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
 	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
@@ -79,7 +137,7 @@ config BUSYBOX_CONFIG_FEATURE_VI_USE_SIGNALS
 	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.