patch 9.1.0659: MS-Windows: MSVC Makefile is a bit hard to read

Problem:  MS-Windows: MSVC Makefile is a bit hard to read
          (after v9.1.0657)
Solution: indent the if/else statements to improve readability
          (Ken Takata)

closes: #15428

Signed-off-by: Ken Takata <kentkt@csc.jp>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 65a8798a990e812fdb18c25be750db5ef09a048e..296d49e8d3a53eff52028b22efe14bf9b9029cc7 100644 (file)
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -166,8 +166,11 @@ RM =               del /f /q
 
 # Read MAJOR and MINOR from version.h.
 !IF ![for /f "tokens=2,3" %I in (version.h) do \
-       @if "%I"=="VIM_VERSION_MAJOR" ( echo MAJOR=%J>.\major.tmp ) \
-       else if "%I"=="VIM_VERSION_MINOR" ( echo MINOR=%J>.\minor.tmp )]
+       @if "%I"=="VIM_VERSION_MAJOR" ( \
+               echo MAJOR=%J> .\major.tmp \
+       ) else if "%I"=="VIM_VERSION_MINOR" ( \
+               echo MINOR=%J> .\minor.tmp && exit \
+       )]
 !ENDIF
 
 !IF EXIST(.\major.tmp)
@@ -189,11 +192,15 @@ MINOR =           1
 !ENDIF
 
 # Read PATCHLEVEL from version.c.
-!IF ![cmd.exe /V:ON /C "echo off && set LINE=0&& set FIND=0&& \
-       for /f "tokens=1,3 delims=,[ " %I in (version.c) do \
-       ( set /A LINE+=1 > NUL && \
-       if "%J"=="included_patches" ( set /A FIND=LINE+3 > NUL ) \
-       else if "!LINE!"=="!FIND!" ( echo PATCHLEVEL=%I>.\patchlvl.tmp && exit ) )"]
+!IF ![cmd.exe /V:ON /Q /C "set LINE=0&& set FIND=0&& \
+       for /f "tokens=1,3 delims=, " %I in (version.c) do ( \
+               set /A LINE+=1 > NUL && \
+               if "%J"=="included_patches[^]" ( \
+                       set /A FIND=LINE+3 > NUL \
+               ) else if "!LINE!"=="!FIND!" ( \
+                       echo PATCHLEVEL=%I> .\patchlvl.tmp && exit \
+               ) \
+       )"]
 !ENDIF
 !IF EXIST(.\patchlvl.tmp)
 ! INCLUDE .\patchlvl.tmp

diff --git a/src/version.c b/src/version.c
index a1e9e538b59f93a52abb4545ea702710ac0dbd4d..ef2f542e51f9e2247086f2c0743983837c107cb5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    659,
 /**/
     658,
 /**/