aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerw7 <erw7.github@gmail.com>2019-08-22 12:06:14 +0900
committerDaniel Hahler <git@thequod.de>2019-08-22 05:06:14 +0200
commit3223dedfc36a883c81d58a4be9e218a1eae5ff66 (patch)
treece30ba7d40054a2976a14309fa42f1f4de91c904
parent86c182c9df5d3504248d36315930e27a5e63abd1 (diff)
downloadrneovim-3223dedfc36a883c81d58a4be9e218a1eae5ff66.tar.gz
rneovim-3223dedfc36a883c81d58a4be9e218a1eae5ff66.tar.bz2
rneovim-3223dedfc36a883c81d58a4be9e218a1eae5ff66.zip
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.
-rw-r--r--src/nvim/testdir/Makefile9
1 files changed, 6 insertions, 3 deletions
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