From f52528477886556e4fc0fa80b6a9d0b8d08cfd9d Mon Sep 17 00:00:00 2001
From: David Bürgin <676c7473@gmail.com>
Date: Thu, 14 May 2015 15:25:56 +0200
Subject: vim-patch:7.4.594 #2654

Problem:    Using a block delete while 'breakindent' is set does not work
            properly.
Solution:   Use "line" instead of "prev_pend" as the first argument to
            lbr_chartabsize_adv().  (Hirohito Higashi)

https://github.com/vim/vim/commit/v7-4-594

See https://groups.google.com/d/msg/vim_dev/B8k0AVlqMUU/qKXeY8srpGcJ
---
 src/nvim/testdir/test_breakindent.in | 17 +++++++++++++++++
 src/nvim/testdir/test_breakindent.ok | 10 ++++++++++
 2 files changed, 27 insertions(+)

(limited to 'src/nvim/testdir')

diff --git a/src/nvim/testdir/test_breakindent.in b/src/nvim/testdir/test_breakindent.in
index 4242e6c266..5c6ec4d927 100644
--- a/src/nvim/testdir/test_breakindent.in
+++ b/src/nvim/testdir/test_breakindent.in
@@ -100,6 +100,23 @@ fygjyl:let line2 = @0
 :$put =line1
 :$put =line2
 :"
+:let g:test="Test 14: breakindent + visual blockwise delete #1"
+:set all& breakindent
+:30vnew
+:normal! 3a1234567890
+:normal! a    abcde
+:exec "normal! 0\<C-V>tex"
+:let line1=ScreenChar(line('.'),8)
+:call DoRecordScreen()
+:"
+:let g:test="Test 15: breakindent + visual blockwise delete #2"
+:%d
+:normal! 4a1234567890
+:exec "normal! >>\<C-V>3f0x"
+:let line1=ScreenChar(line('.'),20)
+:call DoRecordScreen()
+:quit!
+:"
 :%w! test.out
 :qa!
 ENDTEST
diff --git a/src/nvim/testdir/test_breakindent.ok b/src/nvim/testdir/test_breakindent.ok
index 0b16dfce0e..995bd5f29c 100644
--- a/src/nvim/testdir/test_breakindent.ok
+++ b/src/nvim/testdir/test_breakindent.ok
@@ -62,3 +62,13 @@ strdisplaywidth: 46 == calculated: 64
 Test 13: breakindent with wrapping Tab
 d
 w
+
+Test 14: breakindent + visual blockwise delete #1
+e       
+~       
+~       
+
+Test 15: breakindent + visual blockwise delete #2
+        1234567890  
+~                   
+~                   
-- 
cgit