summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/auto/configure4
-rw-r--r--src/configure.in2
-rw-r--r--src/feature.h20
-rw-r--r--src/version.c2
4 files changed, 18 insertions, 10 deletions
diff --git a/src/auto/configure b/src/auto/configure
index ed8ca6aa9..96e50935e 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -4763,8 +4763,8 @@ if test "${with_features+set}" = set; then :
withval=$with_features; features="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $features" >&5
$as_echo "$features" >&6; }
else
- features="normal"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: Defaulting to normal" >&5
-$as_echo "Defaulting to normal" >&6; }
+ features="huge"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: Defaulting to huge" >&5
+$as_echo "Defaulting to huge" >&6; }
fi
diff --git a/src/configure.in b/src/configure.in
index adb30c429..4bb49a70a 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -436,7 +436,7 @@ dnl Check user requested features.
AC_MSG_CHECKING(--with-features argument)
AC_ARG_WITH(features, [ --with-features=TYPE tiny, small, normal, big or huge (default: normal)],
features="$withval"; AC_MSG_RESULT($features),
- features="normal"; AC_MSG_RESULT(Defaulting to normal))
+ features="huge"; AC_MSG_RESULT(Defaulting to huge))
dovimdiff=""
dogvimdiff=""
diff --git a/src/feature.h b/src/feature.h
index c2bf2605d..5de0fcec3 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -54,19 +54,25 @@
#endif
/*
- * These executables are made available with the +big feature, because they
- * are supposed to have enough RAM: Win32 (console & GUI), dos32, OS/2 and VMS.
+ * For Unix, Mac and Win32 use +huge by default. These days CPUs are fast and
+ * Memory is cheap.
+ * Use +big for older systems: Other MS-Windows, dos32, OS/2 and VMS.
* The dos16 version has very little RAM available, use +small.
+ * Otherwise use +normal
*/
#if !defined(FEAT_TINY) && !defined(FEAT_SMALL) && !defined(FEAT_NORMAL) \
&& !defined(FEAT_BIG) && !defined(FEAT_HUGE)
-# if defined(MSWIN) || defined(DJGPP) || defined(VMS) || defined(MACOS) || defined(AMIGA)
-# define FEAT_BIG
+# if defined(UNIX) || defined(WIN3264) || defined(MACOS)
+# define FEAT_HUGE
# else
-# ifdef MSDOS
-# define FEAT_SMALL
+# if defined(MSWIN) || defined(DJGPP) || defined(VMS) || defined(MACOS) || defined(AMIGA)
+# define FEAT_BIG
# else
-# define FEAT_NORMAL
+# ifdef MSDOS
+# define FEAT_SMALL
+# else
+# define FEAT_NORMAL
+# endif
# endif
# endif
#endif
diff --git a/src/version.c b/src/version.c
index fcd86f17d..0d6dbaadc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1145,
+/**/
1144,
/**/
1143,