aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/testdir/test100.in3
-rw-r--r--src/nvim/testdir/test72.in1
-rw-r--r--src/nvim/version.c2
3 files changed, 5 insertions, 1 deletions
diff --git a/src/nvim/testdir/test100.in b/src/nvim/testdir/test100.in
index f9f5f9119f..f6d2e3711b 100644
--- a/src/nvim/testdir/test100.in
+++ b/src/nvim/testdir/test100.in
@@ -18,6 +18,7 @@ STARTTEST
:call FillBuffer()
:call feedkeys(":earlier 10\n", 't')
:call UndoLevel()
+:set ft=unix
:%w! test.out
:new two
:0put ='TWO: expecting global undolevels: 5, local undolevels: 2 (first) then 10 (afterwards)'
@@ -27,6 +28,7 @@ STARTTEST
:call UndoLevel()
:setlocal ul=10
:call UndoLevel()
+:set ft=unix
:%w >> test.out
:wincmd p
:redir >>test.out | echo "global value shouldn't be changed and still be 5!" | echo 'ONE: expecting global undolevels: 5, local undolevels: -123456 (default)'|:setglobal undolevels? | echon ' global' | setlocal undolevels? | echon ' local' |echo "" |redir end
@@ -35,6 +37,7 @@ STARTTEST
:1put ='global value should be changed to 50'
:2put ='THREE: expecting global undolevels: 50, local undolevels: -123456 (default)'
:call UndoLevel()
+:set ft=unix
:%w >> test.out
:"sleep 10
:"
diff --git a/src/nvim/testdir/test72.in b/src/nvim/testdir/test72.in
index 0821764c3c..4700d86981 100644
--- a/src/nvim/testdir/test72.in
+++ b/src/nvim/testdir/test72.in
@@ -8,6 +8,7 @@ STARTTEST
:" Test 'undofile': first a simple one-line change.
:set nocompatible viminfo+=nviminfo visualbell
:set ul=100 undofile nomore
+:set ft=unix
:e! Xtestfile
ggdGithis is one line:set ul=100
:s/one/ONE/
diff --git a/src/nvim/version.c b/src/nvim/version.c
index fbb2b081dd..6d01c8b2e4 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -226,7 +226,7 @@ static int included_patches[] = {
//409 NA
408,
407,
- //406,
+ 406,
405,
//404 NA
//403 NA