aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/version.c2
-rw-r--r--test/functional/legacy/listlbr_utf8_spec.lua15
2 files changed, 7 insertions, 10 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 1efabe9b1b..41bcd7d738 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -161,7 +161,7 @@ static int included_patches[] = {
// 966 NA
// 965 NA
// 964 NA
- // 963,
+ 963,
// 962 NA
// 961,
// 960 NA
diff --git a/test/functional/legacy/listlbr_utf8_spec.lua b/test/functional/legacy/listlbr_utf8_spec.lua
index 64e1325e90..df0e817533 100644
--- a/test/functional/legacy/listlbr_utf8_spec.lua
+++ b/test/functional/legacy/listlbr_utf8_spec.lua
@@ -120,7 +120,9 @@ describe('linebreak', function()
$put ='a b c'
$put ='a b c'
set list nolinebreak cc=3
- sign define foo text=+
+ ]])
+ feed(':sign define foo text=<C-v>uff0b<CR>')
+ source([[
sign place 1 name=foo line=50 buffer=2
norm! 2kztj
let line1=line('.')
@@ -136,8 +138,6 @@ describe('linebreak', function()
redraw!
let line=ScreenChar(winwidth(0),3)
call DoRecordScreen()
- call append('$', ['ScreenAttributes for test9:'])
- call append('$', ["Line: ".line1. " ". string(g:attr),"Line: ".line2. " ". string(g:attr2)])
" expected: attr[2] is different because of colorcolumn
if attr[0] != attr2[0] || attr[1] != attr2[1] || attr[2] != attr2[2]
call append('$', "Screen attributes are different!")
@@ -201,12 +201,9 @@ describe('linebreak', function()
a b c
Test 9: a multibyte sign and colorcolumn
- ¶
- +a b c¶
- a b c¶
- ScreenAttributes for test9:
- Line: 50 ['0', '0', '72', '0']
- Line: 51 ['0', '0', '72', '0']
+ ¶
+ +a b c¶
+ a b c¶
Screen attributes are the same!]])
end)
end)