patch 7.4.1047

Problem:    Tests fail on MS-Windows.
Solution:   Set 'selection' to inclusive.

diff --git a/src/testdir/test_wordcount.in b/src/testdir/test_wordcount.in
index b2db50530ae5e52cc1fd88ef9c919657d967b588..449545bab6558071c18470ff4c586152698b3cc3 100644 (file)
--- a/src/testdir/test_wordcount.in
+++ b/src/testdir/test_wordcount.in
@@ -4,6 +4,7 @@ STARTTEST
 :so small.vim
 :so mbyte.vim
 :set enc=utf8
+:set selection=inclusive
 :new
 :fu DoRecordWin(...)
 :      wincmd k

diff --git a/src/version.c b/src/version.c
index 499387fdf4544a7fdd3bcf803b40ace3bd51822a..9f1ab1b2ea223c8a706c161ff817cefcac0ccccb 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1047,
 /**/
     1046,
 /**/