From 10c050caf99df7324f84b4595e8fd1db7f7a2c10 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Wed, 18 Sep 2019 22:38:27 +0200 Subject: [PATCH] vim-patch:8.1.0599: without the +eval feature the indent tests don't work Problem: Without the +eval feature the indent tests don't work. Solution: Skip the body of the tests. https://github.com/vim/vim/commit/eeed665b0ecd917e88e3475c9615d52546aa124d --- runtime/indent/testdir/cleantest.vim | 13 +++++++++---- runtime/indent/testdir/runtest.vim | 6 ++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/runtime/indent/testdir/cleantest.vim b/runtime/indent/testdir/cleantest.vim index 909cf812c4..69c0a1d4ba 100644 --- a/runtime/indent/testdir/cleantest.vim +++ b/runtime/indent/testdir/cleantest.vim @@ -1,6 +1,11 @@ -" Deletes all the test output files: *.fail and *.out -for fname in glob('testdir/*.out', 1, 1) + glob('testdir/*.fail', 1, 1) - call delete(fname) -endfor +" Only do this with the +eval feature +if 1 + + " Deletes all the test output files: *.fail and *.out + for fname in glob('testdir/*.out', 1, 1) + glob('testdir/*.fail', 1, 1) + call delete(fname) + endfor + +endif quit diff --git a/runtime/indent/testdir/runtest.vim b/runtime/indent/testdir/runtest.vim index 1cc0d3f716..96c31453af 100644 --- a/runtime/indent/testdir/runtest.vim +++ b/runtime/indent/testdir/runtest.vim @@ -2,6 +2,9 @@ " " Current directory must be runtime/indent. +" Only do this with the +eval feature +if 1 + set nocp filetype indent on set nowrapscan @@ -116,4 +119,7 @@ for fname in glob('testdir/*.in', 1, 1) endif endfor +" Matching "if 1" at the start. +endif + qall!