summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-21 20:24:34 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-21 20:24:34 +0100
commite5f2be61595fbbba77261f3bf1e032fe03a1966d (patch)
tree8c38d5ad2c5503dbbb083adc5faa1915f010e1b6
parent88e8f9f14434a7cd538d0c159dc432bea869a5bd (diff)
downloadvim-git-e5f2be61595fbbba77261f3bf1e032fe03a1966d.tar.gz
patch 7.4.1148v7.4.1148
Problem: Default for MingW and Cygwin is still "normal". Solution: Use "huge" as default. (Ken Takata)
-rw-r--r--src/Make_cyg_ming.mak2
-rw-r--r--src/Make_mvc.mak4
-rw-r--r--src/version.c2
3 files changed, 5 insertions, 3 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index a73d77d6a..203438a59 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -39,7 +39,7 @@ GUI=yes
DIRECTX=no
# FEATURES=[TINY | SMALL | NORMAL | BIG | HUGE]
# Set to TINY to make minimal version (few features).
-FEATURES=BIG
+FEATURES=HUGE
# Set to one of i386, i486, i586, i686 as the minimum target processor.
# For amd64/x64 architecture set ARCH=x86-64 .
ARCH=i386
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index df5a748ce..217df5710 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -20,7 +20,7 @@
#
# !!!! After changing features do "nmake clean" first !!!!
#
-# Feature Set: FEATURES=[TINY, SMALL, NORMAL, BIG, HUGE] (default is BIG)
+# Feature Set: FEATURES=[TINY, SMALL, NORMAL, BIG, HUGE] (default is HUGE)
#
# GUI interface: GUI=yes (default is no)
#
@@ -950,7 +950,7 @@ CFLAGS = $(CFLAGS) -DMSWINPS
# FEATURES: TINY, SMALL, NORMAL, BIG or HUGE
#
!if "$(FEATURES)"==""
-FEATURES = BIG
+FEATURES = HUGE
!endif
CFLAGS = $(CFLAGS) -DFEAT_$(FEATURES)
diff --git a/src/version.c b/src/version.c
index 34666f9a0..792f8a746 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 */
/**/
+ 1148,
+/**/
1147,
/**/
1146,