diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-05-24 17:33:01 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-05-24 17:33:01 +0200 |
| commit | 3020a87cb121123abf1e9a1eca0eddac241fc481 (patch) | |
| tree | 2c772b456eeec61a5c0ffe77b45abbe82c8880ec | |
| parent | d22a6f8aaf4dbffc9254965e39e031914dbc495a (diff) | |
| download | vim-git-3020a87cb121123abf1e9a1eca0eddac241fc481.tar.gz | |
patch 8.1.1382: error when editing test filev8.1.1382
Problem: Error when editing test file.
Solution: Remove part of modeline.
| -rw-r--r-- | src/testdir/test49.in | 2 | ||||
| -rw-r--r-- | src/testdir/test49.vim | 3 | ||||
| -rw-r--r-- | src/testdir/test_vimscript.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/testdir/test49.in b/src/testdir/test49.in index a0c9e0d3a..79f13f6a5 100644 --- a/src/testdir/test49.in +++ b/src/testdir/test49.in @@ -5,7 +5,7 @@ test49.failed, try to add one or more "G"s at the line ending in "test.out" STARTTEST :so small.vim -:se nocp nomore viminfo+=nviminfo modelineexpr +:se nocp nomore viminfo+=nviminfo :lang mess C :so test49.vim :" Go back to this file and append the results from register r. diff --git a/src/testdir/test49.vim b/src/testdir/test49.vim index 97088f01e..7393ec415 100644 --- a/src/testdir/test49.vim +++ b/src/testdir/test49.vim @@ -1,6 +1,6 @@ " Vim script language tests " Author: Servatius Brandt <Servatius.Brandt@fujitsu-siemens.com> -" Last Change: 2019 Jan 13 +" 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/testdir/test_vimscript.vim b/src/testdir/test_vimscript.vim index 3eb47a8ab..39ee0bfee 100644 --- a/src/testdir/test_vimscript.vim +++ b/src/testdir/test_vimscript.vim @@ -1668,5 +1668,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',\ "") "------------------------------------------------------------------------------- diff --git a/src/version.c b/src/version.c index 2401cc2a8..b5cee8ead 100644 --- a/src/version.c +++ b/src/version.c @@ -768,6 +768,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1382, +/**/ 1381, /**/ 1380, |