diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-06-03 19:43:16 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-06-03 19:43:16 +0200 |
| commit | 1aa07bdead2e93501c54591e31fe73b9b09c58b5 (patch) | |
| tree | c149ff080219e2149a375da5b9d8982392db5182 | |
| parent | 2f095a4bc4d786e0ac834f48dd18a94fe2d140e3 (diff) | |
| download | vim-git-1aa07bdead2e93501c54591e31fe73b9b09c58b5.tar.gz | |
patch 7.4.1885v7.4.1885
Problem: MinGW console build defaults to not having +channel.
Solution: Include the channel feature if building with huge features. (Ken
Takata)
| -rw-r--r-- | src/Make_cyg_ming.mak | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 62585e996..cdf10acee 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -67,7 +67,11 @@ CSCOPE=yes # Set to yes to enable Netbeans support (requires CHANNEL). NETBEANS=$(GUI) # Set to yes to enable inter process communication. +ifeq (HUGE, $(FEATURES)) +CHANNEL=yes +else CHANNEL=$(GUI) +endif # Link against the shared version of libstdc++ by default. Set diff --git a/src/version.c b/src/version.c index 0f9e840ca..e2624cff3 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1885, +/**/ 1884, /**/ 1883, |