To: vim_dev@googlegroups.com Subject: Patch 8.0.1701 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1701 Problem: Can disable COLOR_EMOJI with MSVC but not MinGW. Solution: Add COLOR_EMOJI flag. Also add some empty lines for readability. Files: src/Make_cyg_ming.mak *** ../vim-8.0.1700/src/Make_cyg_ming.mak 2018-03-14 21:38:57.908996048 +0100 --- src/Make_cyg_ming.mak 2018-04-12 20:17:54.329563606 +0200 *************** *** 28,79 **** # Updated 2014 Oct 13. #>>>>> choose options: # set to yes for a debug build DEBUG=no # set to SIZE for size, SPEED for speed, MAXSPEED for maximum optimization OPTIMIZE=MAXSPEED # set to yes to make gvim, no for vim GUI=yes # set to no if you do not want to use DirectWrite (DirectX) # MinGW-w64 is needed, and ARCH should be set to i686 or x86-64. DIRECTX=yes ! # FEATURES=[TINY | SMALL | NORMAL | BIG | HUGE] ! # Set to TINY to make minimal version (few features). ! FEATURES=HUGE # Set to one of i386, i486, i586, i686 as the minimum target processor. # For amd64/x64 architecture set ARCH=x86-64 . # If not set, it will be automatically detected. (Normally i686 or x86-64.) #ARCH=i686 # Set to yes to cross-compile from unix; no=native Windows (and Cygwin). CROSS=no # Set to path to iconv.h and libiconv.a to enable using 'iconv.dll'. # Use "yes" when the path does not need to be define. #ICONV="." ICONV=yes GETTEXT=yes # Set to yes to include multibyte support. MBYTE=yes # Set to yes to include IME support. IME=yes DYNAMIC_IME=yes # Set to yes to enable writing a postscript file with :hardcopy. POSTSCRIPT=no # Set to yes to enable OLE support. OLE=no # Set the default $(WINVER) to make it work with WinXP. ifndef WINVER WINVER = 0x0501 endif # Set to yes to enable Cscope support. 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 # Set to yes to enable terminal support. ifeq (HUGE, $(FEATURES)) TERMINAL=yes --- 28,98 ---- # Updated 2014 Oct 13. #>>>>> choose options: + # FEATURES=[TINY | SMALL | NORMAL | BIG | HUGE] + # Set to TINY to make minimal version (few features). + FEATURES=HUGE + # set to yes for a debug build DEBUG=no + # set to SIZE for size, SPEED for speed, MAXSPEED for maximum optimization OPTIMIZE=MAXSPEED + # set to yes to make gvim, no for vim GUI=yes + # set to no if you do not want to use DirectWrite (DirectX) # MinGW-w64 is needed, and ARCH should be set to i686 or x86-64. DIRECTX=yes ! ! # Disable Color emoji support ! # (default is yes if DIRECTX=yes, requires WinSDK 8.1 or later.) ! #COLOR_EMOJI=no ! # Set to one of i386, i486, i586, i686 as the minimum target processor. # For amd64/x64 architecture set ARCH=x86-64 . # If not set, it will be automatically detected. (Normally i686 or x86-64.) #ARCH=i686 # Set to yes to cross-compile from unix; no=native Windows (and Cygwin). CROSS=no + # Set to path to iconv.h and libiconv.a to enable using 'iconv.dll'. # Use "yes" when the path does not need to be define. #ICONV="." ICONV=yes GETTEXT=yes + # Set to yes to include multibyte support. MBYTE=yes + # Set to yes to include IME support. IME=yes DYNAMIC_IME=yes + # Set to yes to enable writing a postscript file with :hardcopy. POSTSCRIPT=no + # Set to yes to enable OLE support. OLE=no + # Set the default $(WINVER) to make it work with WinXP. ifndef WINVER WINVER = 0x0501 endif + # Set to yes to enable Cscope support. 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 + # Set to yes to enable terminal support. ifeq (HUGE, $(FEATURES)) TERMINAL=yes *************** *** 588,594 **** ifeq ($(DIRECTX),yes) # Only allow DirectWrite for a GUI build. ifeq (yes, $(GUI)) ! DEFINES += -DFEAT_DIRECTX -DDYNAMIC_DIRECTX -DFEAT_DIRECTX_COLOR_EMOJI endif endif --- 607,616 ---- ifeq ($(DIRECTX),yes) # Only allow DirectWrite for a GUI build. ifeq (yes, $(GUI)) ! DEFINES += -DFEAT_DIRECTX -DDYNAMIC_DIRECTX ! ifneq ($(COLOR_EMOJI),no) ! DEFINES += -DFEAT_DIRECTX_COLOR_EMOJI ! endif endif endif *** ../vim-8.0.1700/src/version.c 2018-04-12 20:06:01.322496517 +0200 --- src/version.c 2018-04-12 20:20:16.072586605 +0200 *************** *** 764,765 **** --- 764,767 ---- { /* Add new patch number below this line */ + /**/ + 1701, /**/ -- "Hit any key to continue" is very confusing when you have two keyboards. /// 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 ///