commit 470adb827f3d9e6cf62f685738d2db216daf3738
author Bram Moolenaar <Bram@vim.org> Mon Jul 20 21:21:30 2020 +0200
committer Bram Moolenaar <Bram@vim.org> Mon Jul 20 21:21:30 2020 +0200
tree 2cc8899621e909ced8e3870af1b4e4cf08bf1f68
parent b146e01a7e41bf5787a2b5ccc6c340ed6001f308

patch 8.2.1254: MS-Windows: regexp test may fail if 'iskeyword' set wrongly

Problem:    MS-Windows: regexp test may fail if 'iskeyword' set wrongly.
Solution:   Override the 'iskeyword' value. (Taro Muraoka, closes #6502)

src/testdir/test_regexp_utf8.vim

diff --git a/src/testdir/test_regexp_utf8.vim b/src/testdir/test_regexp_utf8.vim
index e8e67a6..5100b37 100644
--- a/src/testdir/test_regexp_utf8.vim
+++ b/src/testdir/test_regexp_utf8.vim
@@ -32,6 +32,9 @@
 endfunc
 
 func s:classes_test()
+  if has('win32')
+    set iskeyword=@,48-57,_,192-255
+  endif
   set isprint=@,161-255
   call assert_equal('Motörhead', matchstr('Motörhead', '[[:print:]]\+'))
 

src/version.c

diff --git a/src/version.c b/src/version.c
index daec765..8cedb1c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1254,
+/**/
     1253,
 /**/
     1252,