To: vim_dev@googlegroups.com Subject: Patch 8.0.1474 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1474 Problem: Visual C 2017 has multiple MSVCVER numbers. Solution: Assume the 2017 version if MSVCVER >= 1910. (Leonardo Valeri Manera, closes #2619) Files: src/Make_mvc.mak *** ../vim-8.0.1473/src/Make_mvc.mak 2018-02-04 19:37:30.941710743 +0100 --- src/Make_mvc.mak 2018-02-06 22:00:21.061980179 +0100 *************** *** 289,295 **** MSVCRT_VER = ($(MSVCVER) / 10 - 60) # Visual C++ 2017 needs special handling # it has an _MSC_VER of 1910->14.1, but is actually v15 with runtime v140 ! !elseif $(MSVCVER) == 1910 MSVC_MAJOR = 15 MSVCRT_VER = 140 !else --- 289,296 ---- MSVCRT_VER = ($(MSVCVER) / 10 - 60) # Visual C++ 2017 needs special handling # it has an _MSC_VER of 1910->14.1, but is actually v15 with runtime v140 ! # TODO: what's the maximum value? ! !elseif $(MSVCVER) >= 1910 MSVC_MAJOR = 15 MSVCRT_VER = 140 !else *** ../vim-8.0.1473/src/version.c 2018-02-04 19:37:30.945710712 +0100 --- src/version.c 2018-02-06 22:01:58.021217786 +0100 *************** *** 773,774 **** --- 773,776 ---- { /* Add new patch number below this line */ + /**/ + 1474, /**/ -- LAUNCELOT: At last! A call! A cry of distress ... (he draws his sword, and turns to CONCORDE) Concorde! Brave, Concorde ... you shall not have died in vain! CONCORDE: I'm not quite dead, sir ... "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// 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 ///