From d25a59f4d0c357fd4df4adc8e2d60497f742c41a Mon Sep 17 00:00:00 2001
From: watiko <service@mail.watiko.net>
Date: Mon, 25 Jan 2016 03:55:47 +0900
Subject: vim-patch:7.4.639

Problem:    Combination of linebreak and conceal doesn't work well.
Solution:   Fix the display problems. (Christian Brabandt)

https://github.com/vim/vim/commit/8fc6bc71266e342d339c851b3ee472357f917597
---
 src/nvim/testdir/test88.in | 11 +++++++++++
 src/nvim/testdir/test88.ok |  5 +++++
 2 files changed, 16 insertions(+)

(limited to 'src/nvim/testdir')

diff --git a/src/nvim/testdir/test88.in b/src/nvim/testdir/test88.in
index c2e6a752fa..9e43f703e9 100644
--- a/src/nvim/testdir/test88.in
+++ b/src/nvim/testdir/test88.in
@@ -71,6 +71,17 @@ GGk
 :set lbr
 :normal $
 GGk
+:set list listchars=tab:>-
+:normal 0
+GGk
+:normal W
+GGk
+:normal W
+GGk
+:normal W
+GGk
+:normal $
+GGk
 :" Display result.
 :call append('$', 'end:')
 :call append('$', positions)
diff --git a/src/nvim/testdir/test88.ok b/src/nvim/testdir/test88.ok
index e29698b7bd..12949f274a 100644
--- a/src/nvim/testdir/test88.ok
+++ b/src/nvim/testdir/test88.ok
@@ -22,3 +22,8 @@ end:
 9:25
 9:26
 9:26
+9:1
+9:9
+9:17
+9:25
+9:26
-- 
cgit 


From 8771e84db7f795dd15b04efa585f772b8b7e705d Mon Sep 17 00:00:00 2001
From: watiko <service@mail.watiko.net>
Date: Mon, 25 Jan 2016 10:07:16 +0900
Subject: vim-patch:7.4.753

Problem:    Appending in Visual mode with 'linebreak' set does not work
            properly.  Also when 'selection' is "exclusive". (Ingo Karkat)
Solution:   Recalculate virtual columns. (Christian Brabandt)

https://github.com/vim/vim/commit/74db34cc9162445e3d500ab2d61c5c19ce9af0ca
---
 src/nvim/testdir/test_listlbr.in | 10 ++++++++++
 src/nvim/testdir/test_listlbr.ok |  5 +++++
 2 files changed, 15 insertions(+)

(limited to 'src/nvim/testdir')

diff --git a/src/nvim/testdir/test_listlbr.in b/src/nvim/testdir/test_listlbr.in
index 36235ea915..57202b46eb 100644
--- a/src/nvim/testdir/test_listlbr.in
+++ b/src/nvim/testdir/test_listlbr.in
@@ -60,11 +60,21 @@ STARTTEST
 :set cpo&vim linebreak
 :let g:test ="Test 6: set linebreak with visual block mode"
 :let line="REMOVE: this not"
+:$put =g:test
 :$put =line
 :let line="REMOVE: aaaaaaaaaaaaa"
 :$put =line
 :1/^REMOVE:
 0jf x:$put
+:set cpo&vim linebreak
+:let g:test ="Test 7: set linebreak with visual block mode and v_b_A"
+:$put =g:test
+Golong line: 40afoobar aTARGET at end
+:exe "norm! $3B\<C-v>eAx\<Esc>"
+:set cpo&vim linebreak sbr=
+:let g:test ="Test 8: set linebreak with visual char mode and changing block"
+:$put =g:test
+Go1111-1111-1111-11-1111-1111-11110f-lv3lc2222bgj.
 :%w! test.out
 :qa!
 ENDTEST
diff --git a/src/nvim/testdir/test_listlbr.ok b/src/nvim/testdir/test_listlbr.ok
index ee74667661..82881234c4 100644
--- a/src/nvim/testdir/test_listlbr.ok
+++ b/src/nvim/testdir/test_listlbr.ok
@@ -32,7 +32,12 @@ Sabbbbbb bla
 ~                   
 ~                   
 ~                   
+Test 6: set linebreak with visual block mode
 this not
 aaaaaaaaaaaaa
 REMOVE: 
 REMOVE: 
+Test 7: set linebreak with visual block mode and v_b_A
+long line: foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar TARGETx at end
+Test 8: set linebreak with visual char mode and changing block
+1111-2222-1111-11-1111-2222-1111
-- 
cgit