changeset 16760:b55b4a21f006 v8.1.1382

patch 8.1.1382: error when editing test file commit https://github.com/vim/vim/commit/3020a87cb121123abf1e9a1eca0eddac241fc481 Author: Bram Moolenaar <Bram@vim.org> Date: Fri May 24 17:33:01 2019 +0200 patch 8.1.1382: error when editing test file Problem: Error when editing test file. Solution: Remove part of modeline.
author Bram Moolenaar <Bram@vim.org>
date Fri, 24 May 2019 17:45:05 +0200
parents 432ae2a3c2de
children cf3f6a27089d
files src/testdir/test49.in src/testdir/test49.vim src/testdir/test_vimscript.vim src/version.c
diffstat 4 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test49.in
+++ b/src/testdir/test49.in
@@ -5,7 +5,7 @@ test49.failed, try to add one or more "G
 
 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.
--- 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',\ "")
-"-------------------------------------------------------------------------------
+"-------------------------------------------------------------------------------
--- 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',\ "")
 "-------------------------------------------------------------------------------
--- 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,