aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-07-29 02:30:54 +0200
committerJustin M. Keyes <justinkz@gmail.com>2017-08-12 17:39:06 +0200
commitb7320471de524ffa0e2ba3f561e4c117c1600b62 (patch)
tree1e441047c873219b2694eeabce7acb65162d6123
parent1bcb3ed0e29e924167c8429fde2338dd9a6c29d4 (diff)
downloadrneovim-b7320471de524ffa0e2ba3f561e4c117c1600b62.tar.gz
rneovim-b7320471de524ffa0e2ba3f561e4c117c1600b62.tar.bz2
rneovim-b7320471de524ffa0e2ba3f561e4c117c1600b62.zip
vim-patch:8.0.0128
Problem: Display test fails on MS-Windows. Solution: Set 'isprint' to "@". https://github.com/vim/vim/commit/7089237885218eb8a19805bc2b75481c4efcd6ba
-rw-r--r--src/nvim/testdir/test_display.vim2
-rw-r--r--src/nvim/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/nvim/testdir/test_display.vim b/src/nvim/testdir/test_display.vim
index ba7b7d7626..609e16c737 100644
--- a/src/nvim/testdir/test_display.vim
+++ b/src/nvim/testdir/test_display.vim
@@ -18,6 +18,8 @@ function! Test_display_foldcolumn()
new
vnew
vert resize 25
+ call assert_equal(25, winwidth(winnr()))
+ set isprint=@
1put='e more noise blah blah‚ more stuff here'
diff --git a/src/nvim/version.c b/src/nvim/version.c
index ca1d64ac56..dfee84c1b2 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -824,7 +824,7 @@ static const int included_patches[] = {
// 131,
// 130 NA
// 129 NA
- // 128,
+ 128,
127,
126,
// 125,