To: vim_dev@googlegroups.com
Subject: Patch 7.4.1880
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4.1880
Problem:    MS-Windows console build defaults to not having +channel.
Solution:   Include the channel feature if building with huge features.
Files:      src/Make_mvc.mak


*** ../vim-7.4.1879/src/Make_mvc.mak	2016-03-11 22:52:00.742438030 +0100
--- src/Make_mvc.mak	2016-06-02 20:26:00.586714614 +0200
***************
*** 263,268 ****
--- 263,272 ----
  # INCLUDE = c:\msvc20\include
  # LIB = c:\msvc20\lib
  
+ !if "$(FEATURES)"==""
+ FEATURES = HUGE
+ !endif
+ 
  !ifndef CTAGS
  CTAGS = ctags
  !endif
***************
*** 283,290 ****
--- 287,298 ----
  !endif
  
  !ifndef CHANNEL
+ !if "$(FEATURES)"=="HUGE"
+ CHANNEL = yes
+ !else
  CHANNEL = $(GUI)
  !endif
+ !endif
  
  # Only allow NETBEANS and XPM for a GUI build and CHANNEL.
  !if "$(GUI)" == "yes"
***************
*** 953,961 ****
  #
  # FEATURES: TINY, SMALL, NORMAL, BIG or HUGE
  #
- !if "$(FEATURES)"==""
- FEATURES = HUGE
- !endif
  CFLAGS = $(CFLAGS) -DFEAT_$(FEATURES)
  
  #
--- 961,966 ----
*** ../vim-7.4.1879/src/version.c	2016-06-02 20:07:05.552382799 +0200
--- src/version.c	2016-06-02 20:26:12.856367017 +0200
***************
*** 755,756 ****
--- 755,758 ----
  {   /* Add new patch number below this line */
+ /**/
+     1880,
  /**/

-- 
Seen it all, done it all, can't remember most of it.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///