Mercurial > vim

changeset 14989:85467d180844 v8.1.0506

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0506: modeline test fails when run by root commit https://github.com/vim/vim/commit/9691f82f862ed18c2e3e48f9d2cd902bb947f803 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Nov 3 19:06:25 2018 +0100 patch 8.1.0506: modeline test fails when run by root Problem: Modeline test fails when run by root. Solution: Set 'modeline' for the test. (James McCoy, closes https://github.com/vim/vim/issues/3592)
author Bram Moolenaar <Bram@vim.org>
date Sat, 03 Nov 2018 19:15:08 +0100
parents 7cd1dc37e5e8
children 651a9bce30ac
files src/testdir/test_modeline.vim src/version.c
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_modeline.vim
+++ b/src/testdir/test_modeline.vim
@@ -1,9 +1,12 @@
 " Tests for parsing the modeline.
 
 func Test_modeline_invalid()
-  " This was reading before allocated memory.
+  " This was reading allocated memory in the past.
   call writefile(['vi:0', 'nothing'], 'Xmodeline')
+  let modeline = &modeline
+  set modeline
   call assert_fails('split Xmodeline', 'E518:')
+  let &modeline = modeline
   bwipe!
   call delete('Xmodeline')
 endfunc
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    506,
+/**/
     505,
 /**/
     504,