summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-07-10 15:22:32 +0200
committerBram Moolenaar <Bram@vim.org>2018-07-10 15:22:32 +0200
commitbde14d8e24f6b8ca409290733dbf11cb6fee5751 (patch)
tree2fd8ad2b51713a104da83269d5667e5e0ccacf3e
parent907dad72ef9d29422352fb74ba156e7085a3fc71 (diff)
downloadvim-git-bde14d8e24f6b8ca409290733dbf11cb6fee5751.tar.gz
patch 8.1.0175: marks test fails in very wide windowv8.1.0175
Problem: Marks test fails in very wide window. (Vladimir Lomov) Solution: Extend the text to match 'columns'. (closes #3180, closes #3181)
-rw-r--r--src/testdir/test_marks.vim7
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 5 deletions
diff --git a/src/testdir/test_marks.vim b/src/testdir/test_marks.vim
index b05246e06..8858cd22b 100644
--- a/src/testdir/test_marks.vim
+++ b/src/testdir/test_marks.vim
@@ -126,15 +126,12 @@ func Test_marks_cmd_multibyte()
return
endif
new Xone
- call setline(1, ['ááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááá'])
+ call setline(1, [repeat('á', &columns)])
norm! ma
let a = split(execute('marks a'), "\n")
call assert_equal(2, len(a))
- let expected = ' a 1 0 '
- while strwidth(expected) < &columns - 1
- let expected .= 'á'
- endwhile
+ let expected = ' a 1 0 ' . repeat('á', &columns - 16)
call assert_equal(expected, a[1])
bwipe!
diff --git a/src/version.c b/src/version.c
index 6b422e670..58751e321 100644
--- a/src/version.c
+++ b/src/version.c
@@ -790,6 +790,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 175,
+/**/
174,
/**/
173,