aboutsummaryrefslogtreecommitdiffstats
path: root/package/busybox/config/editors
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2010-04-03 00:58:46 +0000
committerNicolas Thill <nico@openwrt.org>2010-04-03 00:58:46 +0000
commit8be628f50a9626ad6a3b44df9f1b84dc4e01394f (patch)
tree5616527ebb38eeeacb0916ef8ee7f2d1e5240721 /package/busybox/config/editors
parent15f9699e985a6d0c93283366864c2ffc43e53b2c (diff)
downloadupstream-8be628f50a9626ad6a3b44df9f1b84dc4e01394f.tar.gz
upstream-8be628f50a9626ad6a3b44df9f1b84dc4e01394f.tar.bz2
upstream-8be628f50a9626ad6a3b44df9f1b84dc4e01394f.zip
busybox: update to v1.16.1 (based on v1.16.0 update patch from Peter Wagner)
SVN-Revision: 20661
Diffstat (limited to 'package/busybox/config/editors')
-rw-r--r--package/busybox/config/editors/Config.in17
1 files changed, 4 insertions, 13 deletions
diff --git a/package/busybox/config/editors/Config.in b/package/busybox/config/editors/Config.in
index 9eb85bbb87..6175df72fc 100644
--- a/package/busybox/config/editors/Config.in
+++ b/package/busybox/config/editors/Config.in
@@ -35,13 +35,12 @@ config BUSYBOX_CONFIG_DIFF
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
- depends on BUSYBOX_CONFIG_DIFF
+ depends on BUSYBOX_CONFIG_DIFF && BUSYBOX_CONFIG_LONG_OPTS
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"
@@ -51,14 +50,6 @@ config BUSYBOX_CONFIG_FEATURE_DIFF_DIR
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