From 3223dedfc36a883c81d58a4be9e218a1eae5ff66 Mon Sep 17 00:00:00 2001 From: erw7 Date: Thu, 22 Aug 2019 12:06:14 +0900 Subject: test: fix problem of breaking user's viminfo (#10824) Vim turns on 'compatible' as a side effect of using the -u command line option. As a result, viminfo is not used. But that is not the case with neovim. neovim requires the -i command line option to avoid breaking user's viminfo. --- src/nvim/testdir/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index b72f55730f..90381d9116 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -101,13 +101,16 @@ test1.out: $(NVIM_PRG) $(SCRIPTS): $(NVIM_PRG) test1.out NO_PLUGINS = --noplugin --headless -NO_INITS = -U NONE $(NO_PLUGINS) +# In vim, if the -u command line option is specified, compatible is turned on +# and viminfo is not read. Unlike vim, neovim reads viminfo and requires the +# -i command line option. +NO_INITS = -U NONE -i NONE $(NO_PLUGINS) # TODO: find a way to avoid changing the distributed files. fixff: - -$(NVIM_PRG) -u unix.vim $(NO_INITS) "+argdo set ff=dos|upd" +q \ + -$(NVIM_PRG) $(NO_INITS) -u unix.vim "+argdo set ff=dos|upd" +q \ *.in *.ok - -$(NVIM_PRG) -u unix.vim $(NO_INITS) "+argdo set ff=dos|upd" +q \ + -$(NVIM_PRG) $(NO_INITS) -u unix.vim "+argdo set ff=dos|upd" +q \ dotest.in RM_ON_RUN := test.out X* viminfo -- cgit