summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorK.Takata <kentkt@csc.jp>2022-02-22 11:04:50 +0000
committerBram Moolenaar <Bram@vim.org>2022-02-22 11:04:50 +0000
commit0f113e4f7b698fc94c1a8377afdb7249329beaee (patch)
treec888ece728d4546f2338688844994375d0682c4b
parent4e889f98e95ac05d7c8bd3ee933ab4d47820fdfa (diff)
downloadvim-git-0f113e4f7b698fc94c1a8377afdb7249329beaee.tar.gz
patch 8.2.4437: vartabs test fails on MS-Windowsv8.2.4437
Problem: Vartabs test fails on MS-Windows. Solution: Use iso8859-1 'encoding'. (Ken Takata, closes #9818)
-rw-r--r--src/testdir/test_vartabs.vim6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/testdir/test_vartabs.vim b/src/testdir/test_vartabs.vim
index d21acfe3a..74b07ba14 100644
--- a/src/testdir/test_vartabs.vim
+++ b/src/testdir/test_vartabs.vim
@@ -445,10 +445,10 @@ endfunc
func Test_vartabstop_latin1()
let save_encoding = &encoding
new
- set encoding=iso8859
- silent norm :se 
+ set encoding=iso8859-1
+ silent exe "norm :se \<C-A>\<C-C>"
set vartabstop=400
- norm i00 
+ exe "norm i00\t\<C-D>"
bwipe!
let &encoding = save_encoding
endfunc
diff --git a/src/version.c b/src/version.c
index 6eae5e66f..700102901 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4437,
+/**/
4436,
/**/
4435,