summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-07-20 21:21:30 +0200
committerBram Moolenaar <Bram@vim.org>2020-07-20 21:21:30 +0200
commit470adb827f3d9e6cf62f685738d2db216daf3738 (patch)
tree2cc8899621e909ced8e3870af1b4e4cf08bf1f68
parentb146e01a7e41bf5787a2b5ccc6c340ed6001f308 (diff)
downloadvim-git-470adb827f3d9e6cf62f685738d2db216daf3738.tar.gz
patch 8.2.1254: MS-Windows: regexp test may fail if 'iskeyword' set wronglyv8.2.1254
Problem: MS-Windows: regexp test may fail if 'iskeyword' set wrongly. Solution: Override the 'iskeyword' value. (Taro Muraoka, closes #6502)
-rw-r--r--src/testdir/test_regexp_utf8.vim3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/test_regexp_utf8.vim b/src/testdir/test_regexp_utf8.vim
index e8e67a62c..5100b378a 100644
--- a/src/testdir/test_regexp_utf8.vim
+++ b/src/testdir/test_regexp_utf8.vim
@@ -32,6 +32,9 @@ func Test_equivalence_re2()
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:]]\+'))
diff --git a/src/version.c b/src/version.c
index daec76500..8cedb1cb9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1254,
+/**/
1253,
/**/
1252,