From 7c1e56703b4ecfc69ed6e98b094f2249f62dd31d Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sat, 22 Jun 2019 22:09:32 -0400 Subject: [PATCH 9/9] vim-patch:8.1.1382: error when editing test file Problem: Error when editing test file. Solution: Remove part of modeline. https://github.com/vim/vim/commit/3020a87cb121123abf1e9a1eca0eddac241fc481 (cherry picked from commit 13f3a21226fdd31c42ba927ff12ac6c34c940311) Signed-off-by: James McCoy --- src/nvim/testdir/test49.in | 2 +- src/nvim/testdir/test49.vim | 3 +-- src/nvim/testdir/test_viml.vim | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/nvim/testdir/test49.in b/src/nvim/testdir/test49.in index eb17ace2f..435e62765 100644 --- a/src/nvim/testdir/test49.in +++ b/src/nvim/testdir/test49.in @@ -4,7 +4,7 @@ If after adding a new test, the test output doesn't appear properly in test49.failed, try to add one or more "G"s at the line ending in "test.out" STARTTEST -:se nomore modelineexpr +:se nomore :lang mess C :so test49.vim :" Go back to this file and append the results from register r. diff --git a/src/nvim/testdir/test49.vim b/src/nvim/testdir/test49.vim index edd49a2b6..836bdbc3f 100644 --- a/src/nvim/testdir/test49.vim +++ b/src/nvim/testdir/test49.vim @@ -1,6 +1,6 @@ " Vim script language tests " Author: Servatius Brandt -" Last Change: 2016 Feb 07 +" Last Change: 2019 May 24 "------------------------------------------------------------------------------- " Test environment {{{1 @@ -9005,5 +9005,4 @@ Xcheck 50443995 "------------------------------------------------------------------------------- " Modelines {{{1 " vim: ts=8 sw=4 tw=80 fdm=marker -" vim: fdt=substitute(substitute(foldtext(),\ '\\%(^+--\\)\\@<=\\(\\s*\\)\\(.\\{-}\\)\:\ \\%(\"\ \\)\\=\\(Test\ \\d*\\)\:\\s*',\ '\\3\ (\\2)\:\ \\1',\ \"\"),\ '\\(Test\\s*\\)\\(\\d\\)\\D\\@=',\ '\\1\ \\2',\ "") "------------------------------------------------------------------------------- diff --git a/src/nvim/testdir/test_viml.vim b/src/nvim/testdir/test_viml.vim index c39c5e6b2..328c096af 100644 --- a/src/nvim/testdir/test_viml.vim +++ b/src/nvim/testdir/test_viml.vim @@ -978,5 +978,4 @@ endfunc "------------------------------------------------------------------------------- " Modelines {{{1 " vim: ts=8 sw=4 tw=80 fdm=marker -" vim: fdt=substitute(substitute(foldtext(),\ '\\%(^+--\\)\\@<=\\(\\s*\\)\\(.\\{-}\\)\:\ \\%(\"\ \\)\\=\\(Test\ \\d*\\)\:\\s*',\ '\\3\ (\\2)\:\ \\1',\ \"\"),\ '\\(Test\\s*\\)\\(\\d\\)\\D\\@=',\ '\\1\ \\2',\ "") "-------------------------------------------------------------------------------