aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/testdir/runtest.vim3
-rw-r--r--src/nvim/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim
index 578d64efde..1b1f5d7688 100644
--- a/src/nvim/testdir/runtest.vim
+++ b/src/nvim/testdir/runtest.vim
@@ -39,6 +39,9 @@ set nomore
" Output all messages in English.
lang mess C
+" Always use forward slashes.
+set shellslash
+
" Source the test script. First grab the file name, in case the script
" navigates away.
let testname = expand('%')
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 36f2b51ac2..278255c904 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -584,7 +584,7 @@ static int included_patches[] = {
1114,
1113,
1112,
- // 1111,
+ 1111,
1110,
// 1109 NA
1108,