patch 9.1.0527: inconsistent parameter in Makefiles for Vim executable

Problem:  inconsistent parameter in Makefiles for Vim executable
Solution: consistently use $VIMPROG across all Makefiles
          (RestorerZ)

closes: #15099

Signed-off-by: RestorerZ <restorer@mail2k.ru>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/Makefile b/Makefile
index f4db80fb820f1674f49d4bc0a5446e47271da75b..ad073763663f8540f5326d0b869c1827979f13ea 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,7 @@ VIM_FOR_INDENTTEST = ../../src/vim
 indenttest:
        cd runtime/indent && \
                $(MAKE) clean && \
-               $(MAKE) test VIM="$(VIM_FOR_INDENTTEST)"
+               $(MAKE) test VIMPROG="$(VIM_FOR_INDENTTEST)"
 
 # Executable used for running the syntax tests.
 VIM_FOR_SYNTAXTEST = ../../src/vim
@@ -249,9 +249,6 @@ VERSION = $(MAJOR)$(MINOR)
 VDOT   = $(MAJOR).$(MINOR)
 VIMRTDIR = vim$(VERSION)
 
-# Vim used for conversion from "unix" to "dos"
-VIM    = vim
-
 # How to include Filelist depends on the version of "make" you have.
 # If the current choice doesn't work, try the other one.
 

diff --git a/runtime/doc/Make_mvc.mak b/runtime/doc/Make_mvc.mak
index f2fbc52ed5e3b9d33674a51e07d9727c68916561..c387ef8c4fbf521d1715cc89fca7be465f491ce6 100644 (file)
--- a/runtime/doc/Make_mvc.mak
+++ b/runtime/doc/Make_mvc.mak
@@ -12,7 +12,7 @@
 
 # Correct the following line for the where executeable file vim is installed.
 # Please do not put the path in quotes.
-VIMEXE = D:\Programs\Vim\vim90\vim.exe
+VIMPROG = D:\Programs\Vim\vim90\vim.exe
 
 # Correct the following line for the directory where iconv installed.
 # Please do not put the path in quotes.
@@ -63,7 +63,7 @@ doctags : doctags.c
 # Use Vim to generate the tags file.  Can only be used when Vim has been
 # compiled and installed.  Supports multiple languages.
 vimtags : $(DOCS)
-       @"$(VIMEXE)" --clean -esX -V1 -u doctags.vim
+       @"$(VIMPROG)" --clean -esX -V1 -u doctags.vim
 
 
 uganda.nsis.txt : uganda.???
@@ -105,7 +105,7 @@ perlhtml : tags $(DOCS)
 
 # Check URLs in the help with "curl" or "powershell".
 test_urls :
-       "$(VIMEXE)" --clean -S test_urls.vim
+       "$(VIMPROG)" --clean -S test_urls.vim
 
 clean :
        $(RM) doctags.exe doctags.obj

diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile
index 30a4f08bd7f9935659dbb709b26a8cb6e082a242..5f0786db82a503efba70c38f5da78fac3415dff4 100644 (file)
--- a/runtime/doc/Makefile
+++ b/runtime/doc/Makefile
@@ -7,7 +7,7 @@
 AWK = awk
 
 # Set to $(VIMTARGET) when executed from src/Makefile.
-VIMEXE = vim
+VIMPROG = vim
 
 # include the config.mk from the source directory.  It's only needed to set
 # AWK, used for "make html".  Comment this out if the include gives problems.
@@ -25,7 +25,7 @@ all: tags vim.man evim.man vimdiff.man vimtutor.man xxd.man $(CONVERTED)
 # Use Vim to generate the tags file.  Can only be used when Vim has been
 # compiled and installed.  Supports multiple languages.
 vimtags: $(DOCS)
-       @$(VIMEXE) --clean -esX -V1 -u doctags.vim
+       @$(VIMPROG) --clean -esX -V1 -u doctags.vim
 
 # Use "doctags" to generate the tags file.  Only works for English!
 tags: doctags $(DOCS)
@@ -57,7 +57,7 @@ uganda.nsis.txt : uganda.???
             $${dpn} | uniq > $${trg%txt}$${dpn##*.}; \
        done
 # This files needs to be in dos fileformat for NSIS.
-       $(VIMEXE) -e -X -u NONE --cmd "set notitle noicon nocp noml viminfo=" \
+       $(VIMPROG) -e -X -u NONE --cmd "set notitle noicon nocp noml viminfo=" \
          -c "argdo write ++ff=dos" -c "qa" uganda.nsis.???
 
 # Awk version of .txt to .html conversion.
@@ -91,7 +91,7 @@ perlhtml: tags $(DOCS)
 
 # Check URLs in the help with "curl".
 test_urls:
-       $(VIMEXE) --clean -S test_urls.vim
+       $(VIMPROG) --clean -S test_urls.vim
 
 clean:
        -rm -f doctags *.html tags.ref

diff --git a/runtime/indent/Make_mvc.mak b/runtime/indent/Make_mvc.mak
index 0f73d7fa79d52984e4f1f907e8db9e178bf77bfe..a50494d8c55386c5a67867d7dda85b077cc9f8ad 100644 (file)
--- a/runtime/indent/Make_mvc.mak
+++ b/runtime/indent/Make_mvc.mak
@@ -4,7 +4,7 @@
 
 .SUFFIXES:
 
-VIM = vim.exe
+VIMPROG = vim.exe
 VIMRUNTIME = ..
 
 # Run the tests that didn't run yet or failed previously.
@@ -12,7 +12,7 @@ VIMRUNTIME = ..
 # If a test fails a testdir\*.fail file will be written.
 test :
        @ set "VIMRUNTIME=$(VIMRUNTIME)"
-       $(VIM) --clean --not-a-term -u testdir\runtest.vim
+       $(VIMPROG) --clean --not-a-term -u testdir\runtest.vim
 
 
 clean testclean :

diff --git a/runtime/indent/Makefile b/runtime/indent/Makefile
index 66ded80928a30b0fffd043e3a2f844c161cfe183..36a3f156e3c6e6bfaf76c993abd6dcf5dd30d3dd 100644 (file)
--- a/runtime/indent/Makefile
+++ b/runtime/indent/Makefile
@@ -3,14 +3,14 @@
 .SUFFIXES:
 .PHONY: test clean testclean
 
-VIM = vim
+VIMPROG = vim
 VIMRUNTIME = ..
 
 # Run the tests that didn't run yet or failed previously.
 # If a test succeeds a testdir/*.out file will be written.
 # If a test fails a testdir/*.fail file will be written.
 test:
-       VIMRUNTIME=$(VIMRUNTIME) $(VIM) --clean --not-a-term -u testdir/runtest.vim
+       VIMRUNTIME=$(VIMRUNTIME) $(VIMPROG) --clean --not-a-term -u testdir/runtest.vim
 
 
 clean testclean:

diff --git a/runtime/syntax/generator/Makefile b/runtime/syntax/generator/Makefile
index 3cf4b953df3fc34ad26d5a1e1834b2948fb8dbf7..a7ccba388dd2378f73b424e684ec7da5f4e611c0 100644 (file)
--- a/runtime/syntax/generator/Makefile
+++ b/runtime/syntax/generator/Makefile
@@ -1,5 +1,5 @@
 VIM_SRCDIR = ../../../src
-RUN_VIM = $(VIM_SRCDIR)/vim -N -u NONE -i NONE -n
+RUN_VIMPROG = $(VIM_SRCDIR)/vim -N -u NONE -i NONE -n
 REVISION ?= $(shell date +%Y-%m-%dT%H:%M:%S%:z)
 
 SRC =  $(VIM_SRCDIR)/eval.c $(VIM_SRCDIR)/ex_cmds.h $(VIM_SRCDIR)/ex_docmd.c \
@@ -15,13 +15,13 @@ generate: vim.vim
 vim.vim: vim.vim.rc update_date.vim
        @echo "Generating vim.vim ..."
        @cp -f vim.vim.rc ../vim.vim
-       @$(RUN_VIM) -S update_date.vim
+       @$(RUN_VIMPROG) -S update_date.vim
        @echo "done."
 
 vim.vim.rc: gen_syntax_vim.vim vim.vim.base $(SRC)
        @echo "Generating vim.vim.rc ..."
        @rm -f sanity_check.err generator.err
-       @$(RUN_VIM) -S gen_syntax_vim.vim
+       @$(RUN_VIMPROG) -S gen_syntax_vim.vim
        @if test -f sanity_check.err ; then \
                echo ; \
                echo "Sanity errors:" ; \

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 511bfe8ff7032ab24c99313729086b5a335f79d7..adcf19a4e15bc2389c8585cb728c24e8db9506aa 100644 (file)
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -1435,7 +1435,7 @@ test:
 
 testgvim testgui:
        cd testdir
-       $(MAKE) /NOLOGO -f Make_mvc.mak VIMPROG=..\gvim
+       $(MAKE) /NOLOGO -f Make_mvc.mak "VIMPROG=..\gvim.exe"
        cd ..
 
 testtiny:
@@ -1445,7 +1445,7 @@ testtiny:
 
 testgvimtiny:
        cd testdir
-       $(MAKE) /NOLOGO -f Make_mvc.mak tiny VIMPROG=..\gvim
+       $(MAKE) /NOLOGO -f Make_mvc.mak "VIMPROG=..\gvim.exe" tiny
        cd ..
 
 testclean:

diff --git a/src/Makefile b/src/Makefile
index 71578eb8074b11638763365ea818afbf83955b88..a451ee5aa45cf6ba247259d5692eaf8a8945f8cc 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2189,7 +2189,7 @@ test check: unittests $(TERM_TEST) scripttests
 scripttests:
        $(MAKE) -f Makefile $(VIMTARGET)
        if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
-               cd $(PODIR); $(MAKE) -f Makefile check VIM=../$(VIMTARGET); \
+               cd $(PODIR); $(MAKE) -f Makefile check VIMPROG=../$(VIMTARGET); \
        fi
        -if test $(VIMTARGET) != vim -a ! -r vim; then \
                ln -s $(VIMTARGET) vim; \
@@ -2357,7 +2357,7 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(VIMTARGET) $(DEST_RT) \
        # We can assume Vim was build, but it may not have been installed,
        # thus use the executable in the current directory.
        -@BUILD_DIR="`pwd`"; cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)"; then \
-               $(MAKE) VIMEXE="$$BUILD_DIR/$(VIMTARGET)" vimtags; fi
+               $(MAKE) VIMPROG="$$BUILD_DIR/$(VIMTARGET)" vimtags; fi
        cd $(HELPSOURCE); \
                files=`ls *.txt tags`; \
                files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \

diff --git a/src/po/Make_cyg.mak b/src/po/Make_cyg.mak
index 705858da584efb90e48dd94adcfe3f77eed66019..c04837eed35249aac329fd8121dcae5a0d8abf23 100644 (file)
--- a/src/po/Make_cyg.mak
+++ b/src/po/Make_cyg.mak
@@ -16,7 +16,7 @@ endif
 include Make_all.mak
 
 PACKAGE = vim
-VIM = ../vim
+VIMPROG = ../vim
 
 # Uncomment one of the lines below or modify it to put the path to your
 # gettext binaries
@@ -64,18 +64,18 @@ PO_INPUTLIST = \
        vim.desktop.in
 
 first_time: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST)
-       $(VIM) -u NONE --not-a-term -S tojavascript.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST)
+       $(VIMPROG) -u NONE --not-a-term -S tojavascript.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST)
        $(XGETTEXT) --default-domain=$(LANGUAGE) \
                --add-comments $(XGETTEXT_KEYWORDS) $(PO_INPUTLIST) $(PO_VIM_JSLIST)
-       $(VIM) -u NONE --not-a-term -S fixfilenames.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST)
+       $(VIMPROG) -u NONE --not-a-term -S fixfilenames.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST)
        $(RM) *.js
 
 $(PACKAGE).pot: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST)
-       $(VIM) -u NONE --not-a-term -S tojavascript.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST)
+       $(VIMPROG) -u NONE --not-a-term -S tojavascript.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST)
        $(XGETTEXT) --default-domain=$(PACKAGE) \
                --add-comments $(XGETTEXT_KEYWORDS) $(PO_INPUTLIST) $(PO_VIM_JSLIST)
        $(MV) $(PACKAGE).po $(PACKAGE).pot
-       $(VIM) -u NONE --not-a-term -S fixfilenames.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST)
+       $(VIMPROG) -u NONE --not-a-term -S fixfilenames.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST)
        $(RM) *.js
 
 # Don't add a dependency here, we only want to update the .po files manually

diff --git a/src/po/Make_ming.mak b/src/po/Make_ming.mak
index 42dab84449d36ccf6d4c0480400e10743264b23f..21d2d2037cdc8190d99f1eb74c558a5e4c570a13 100644 (file)
--- a/src/po/Make_ming.mak
+++ b/src/po/Make_ming.mak
@@ -23,9 +23,9 @@ include Make_all.mak
 
 PACKAGE = vim
 ifeq (sh.exe, $(SHELL))
-VIM = ..\vim
+VIMPROG = ..\vim
 else
-VIM = ../vim
+VIMPROG = ../vim
 endif
 
 # Uncomment one of the lines below or modify it to put the path to your
@@ -77,18 +77,18 @@ PO_INPUTLIST = \
        vim.desktop.in
 
 first_time: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST)
-       $(VIM) -u NONE --not-a-term -S tojavascript.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST)
+       $(VIMPROG) -u NONE --not-a-term -S tojavascript.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST)
        $(XGETTEXT) --default-domain=$(LANGUAGE) \
                --add-comments $(XGETTEXT_KEYWORDS) $(PO_INPUTLIST) $(PO_VIM_JSLIST)
-       $(VIM) -u NONE --not-a-term -S fixfilenames.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST)
+       $(VIMPROG) -u NONE --not-a-term -S fixfilenames.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST)
        $(RM) *.js
 
 $(PACKAGE).pot: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST)
-       $(VIM) -u NONE --not-a-term -S tojavascript.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST)
+       $(VIMPROG) -u NONE --not-a-term -S tojavascript.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST)
        $(XGETTEXT) --default-domain=$(PACKAGE) \
                --add-comments $(XGETTEXT_KEYWORDS) $(PO_INPUTLIST) $(PO_VIM_JSLIST)
        $(MV) $(PACKAGE).po $(PACKAGE).pot
-       $(VIM) -u NONE --not-a-term -S fixfilenames.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST)
+       $(VIMPROG) -u NONE --not-a-term -S fixfilenames.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST)
        $(RM) *.js
 
 # Don't add a dependency here, we only want to update the .po files manually

diff --git a/src/po/Make_mvc.mak b/src/po/Make_mvc.mak
index a9a69fdcc22fe0bb6d0ad99b30328545184dcd3f..d56adb0f42e301eec26b4f775bb8b538fcb1fcf6 100644 (file)
--- a/src/po/Make_mvc.mak
+++ b/src/po/Make_mvc.mak
@@ -40,7 +40,7 @@ VIMRUNTIME = ..\..\runtime
 PACKAGE = vim
 # Correct the following line for the where executeable file vim is
 # installed.  Please do not put the path in quotes.
-VIM = ..\vim.exe
+VIMPROG = ..\vim.exe
 
 # Correct the following line for the directory where gettext et al is
 # installed.  Please do not put the path in quotes.
@@ -102,7 +102,7 @@ originals : $(MOFILES)
 converted: $(MOCONVERTED)
 
 .po.ck:
-       "$(VIM)" -u NONE --noplugins -e -s -X --cmd "set enc=utf-8" -S check.vim \
+       "$(VIMPROG)" -u NONE --noplugins -e -s -X --cmd "set enc=utf-8" -S check.vim \
                -c "if error == 0 | q | else | num 2 | cq | endif" $<
        $(TOUCH_TARGET)
 
@@ -496,25 +496,25 @@ files: $(PO_INPUTLIST)
        $(LS) $(LSFLAGS) $(PO_INPUTLIST) > .\files
 
 first_time: files
-       "$(VIM)" -u NONE --not-a-term -S tojavascript.vim $(LANGUAGE).po \
+       "$(VIMPROG)" -u NONE --not-a-term -S tojavascript.vim $(LANGUAGE).po \
                $(PO_VIM_INPUTLIST)
        set OLD_PO_FILE_INPUT=yes
        set OLD_PO_FILE_OUTPUT=yes
        $(XGETTEXT) --default-domain=$(LANGUAGE) --add-comments $(XGETTEXT_KEYWORDS) \
                --files-from=.\files $(PO_VIM_JSLIST)
-       "$(VIM)" -u NONE --not-a-term -S fixfilenames.vim $(LANGUAGE).po \
+       "$(VIMPROG)" -u NONE --not-a-term -S fixfilenames.vim $(LANGUAGE).po \
                $(PO_VIM_INPUTLIST)
        $(RM) *.js
 
 $(PACKAGE).pot: files
-       "$(VIM)" -u NONE --not-a-term -S tojavascript.vim $(PACKAGE).pot \
+       "$(VIMPROG)" -u NONE --not-a-term -S tojavascript.vim $(PACKAGE).pot \
                $(PO_VIM_INPUTLIST)
        set OLD_PO_FILE_INPUT=yes
        set OLD_PO_FILE_OUTPUT=yes
        $(XGETTEXT) --default-domain=$(PACKAGE) --add-comments $(XGETTEXT_KEYWORDS) \
                --files-from=.\files $(PO_VIM_JSLIST)
        $(MV) $(PACKAGE).po $(PACKAGE).pot
-       "$(VIM)" -u NONE --not-a-term -S fixfilenames.vim $(PACKAGE).pot \
+       "$(VIMPROG)" -u NONE --not-a-term -S fixfilenames.vim $(PACKAGE).pot \
                $(PO_VIM_INPUTLIST)
        $(RM) *.js
 
@@ -541,10 +541,10 @@ install-all: all
                "$(VIMRUNTIME)\lang\%%l\LC_MESSAGES\$(PACKAGE).mo"
 
 cleanup-po: $(LANGUAGE).po
-       "$(VIM)" -u NONE -e -X -S cleanup.vim -c wq $(LANGUAGE).po
+       "$(VIMPROG)" -u NONE -e -X -S cleanup.vim -c wq $(LANGUAGE).po
 
 cleanup-po-all: $(POFILES)
-       !"$(VIM)" -u NONE -e -X -S cleanup.vim -c wq $**
+       !"$(VIMPROG)" -u NONE -e -X -S cleanup.vim -c wq $**
 
 clean: checkclean
        $(RM) *.mo

diff --git a/src/po/Makefile b/src/po/Makefile
index 87d657bd9018f4c3d41eb40e9ac49b5978de1d5e..eebb7ed64e36d21bd302aa890ade104a10c362c2 100644 (file)
--- a/src/po/Makefile
+++ b/src/po/Makefile
@@ -12,7 +12,7 @@ include $(PO_BASEDIR)/Make_all.mak
 
 PACKAGE = vim
 SHELL = /bin/sh
-VIM = $(PO_BASEDIR)/../vim
+VIMPROG = $(PO_BASEDIR)/../vim
 
 # MacOS sed is locale aware, set $LANG to avoid problems.
 SED = LANG=C sed
@@ -41,7 +41,7 @@ converted: $(MOCONVERTED)
        $(MSGFMTCMD) -o $@ $<
 
 .po.ck:
-       $(VIM) -u NONE --noplugins -e -s -X --cmd "set enc=utf-8" -S check.vim \
+       $(VIMPROG) -u NONE --noplugins -e -s -X --cmd "set enc=utf-8" -S check.vim \
                -c "if error == 0 | q | else | num 2 | cq | endif" $<
        touch $@
 
@@ -262,13 +262,13 @@ PO_INPUTLIST = \
 
 $(PACKAGE).pot: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST)
        # Convert the Vim scripts to (what looks like) Javascript.
-       $(VIM) -u NONE --not-a-term -S $(PO_BASEDIR)/tojavascript.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST)
+       $(VIMPROG) -u NONE --not-a-term -S $(PO_BASEDIR)/tojavascript.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST)
        # Create vim.pot.
        $(XGETTEXT) --default-domain=$(PACKAGE) --add-comments \
                $(XGETTEXT_KEYWORDS) $(PO_INPUTLIST) $(PO_VIM_JSLIST)
        mv -f $(PACKAGE).po $(PACKAGE).pot
        # Fix Vim scripts names, so that "gf" works.
-       $(VIM) -u NONE --not-a-term -S $(PO_BASEDIR)/fixfilenames.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST)
+       $(VIMPROG) -u NONE --not-a-term -S $(PO_BASEDIR)/fixfilenames.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST)
        # Delete the temporary files.
        rm *.js
 

diff --git a/src/testdir/Make_mvc.mak b/src/testdir/Make_mvc.mak
index 318cd4a16cb522cea82b24e3052fd803008c87bf..bd6d1a279f5c6cc50a5fb83a9b08a9248bd8643b 100644 (file)
--- a/src/testdir/Make_mvc.mak
+++ b/src/testdir/Make_mvc.mak
@@ -5,9 +5,9 @@
 
 # Testing may be done with a debug build 
 !IF EXIST(..\\vimd.exe) && !EXIST(..\\vim.exe)
-VIMPROG = ..\\vimd
+VIMPROG = ..\\vimd.exe
 !ELSE
-VIMPROG = ..\\vim
+VIMPROG = ..\\vim.exe
 !ENDIF
 
 

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 4e476f966353984d7763faeb65bed7c715f77661..7a4c4c484d8deced1ff1393370c11f3f9d273a46 100644 (file)
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -84,7 +84,7 @@ test_vim9:
 
 RM_ON_RUN = test.out X* viminfo
 RM_ON_START = test.ok benchmark.out
-RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE) $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim $(NO_INITS) -s dotest.in
+RUN_VIMPROG = VIMRUNTIME=$(SCRIPTSOURCE) $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim $(NO_INITS) -s dotest.in
 
 # Delete files that may interfere with running tests.  This includes some files
 # that may result from working on the tests, not only from running them.
@@ -114,7 +114,7 @@ tinytests: $(SCRIPTS_TINY_OUT)
        @# 200 msec is sufficient, but only modern sleep supports a fraction of
        @# a second, fall back to a second if it fails.
        @-/bin/sh -c "sleep .2 > /dev/null 2>&1 || sleep 1"
-       $(RUN_VIM) $*.in $(REDIR_TEST_TO_NULL)
+       $(RUN_VIMPROG) $*.in $(REDIR_TEST_TO_NULL)
 
        @# Check if the test.out file matches test.ok.
        @/bin/sh -c "if test -f test.out; then \

diff --git a/src/version.c b/src/version.c
index 462b094be9f0017656ac167543ba306d2031ad90..b285a7f6d7e2a3d8e4d1ddd3603e928635e0d679 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 */
+/**/
+    527,
 /**/
     526,
 /**/