patch 9.0.0162: text property "below" gets indent if 'breakindent' is set

Problem:    Text property "below" gets indent if 'breakindent' is set. (Tim
            Pope)
Solution:   Do not put indent before text property. (closes #10859)

diff --git a/src/drawline.c b/src/drawline.c
index 824c416e2dbcf1c56e490a5bcaad25356d928935..eaae4bed3651f37b88bb29c2c4ad29038fed86b6 100644 (file)
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -1407,6 +1407,9 @@ win_line(
                if (wp->w_p_bri && (wlv.row != startrow || need_showbreak)
 # ifdef FEAT_DIFF
                        && filler_lines == 0
+# endif
+# ifdef FEAT_PROP_POPUP
+                       && !dont_use_showbreak
 # endif
                   )
                {

diff --git a/src/testdir/dumps/Test_prop_with_text_after_1.dump b/src/testdir/dumps/Test_prop_with_text_after_1.dump
index c64d1698d5a67ac00bbfd5a0a077ce9f2ee731e7..159e394619144f5fc81e73bc29d366ae62ca04e8 100644 (file)
--- a/src/testdir/dumps/Test_prop_with_text_after_1.dump
+++ b/src/testdir/dumps/Test_prop_with_text_after_1.dump
@@ -1,4 +1,4 @@
-|s+0&#ffffff0|o|m|e| |t|e|x|t| |h|e|r|e| |a|n|d| |o|t|h|e|r| |t|e|x|t| |t|h|e|r|e| +0&#ffff4012|A|F|T|E|R| | +0&#ffffff0@10| +0#ffffff16#e000002|R|I|G|H|T| 
+| +0&#ffffff0@2|s|o|m|e| |t|e|x|t| |h|e|r|e| |a|n|d| |o|t|h|e|r| |t|e|x|t| |t|h|e|r|e| +0&#ffff4012|A|F|T|E|R| | +0&#ffffff0@7| +0#ffffff16#e000002|R|I|G|H|T| 
 | +0#0000000#5fd7ff255|B|E|L|O|W| | +0&#ffffff0@52
 | +0&#5fd7ff255|A|L|S|O| |B|E|L|O|W| | +0&#ffffff0@47
 |L|a|s|t| |l|i|n|e>.| +0&#ffff4012|A|f|t|e|r| |L|a|s|t| | +0&#ffffff0@37

diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
index 8f3a304509961d6297c0d4f1e3e19d1947b51b5b..653db44152c12c1e5cc19f5f04675f11003c442c 100644 (file)
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -2312,7 +2312,8 @@ func Test_props_with_text_after()
 
   let lines =<< trim END
       set showbreak=+++
-      call setline(1, 'some text here and other text there')
+      set breakindent
+      call setline(1, '   some text here and other text there')
       call prop_type_add('rightprop', #{highlight: 'ErrorMsg'})
       call prop_type_add('afterprop', #{highlight: 'Search'})
       call prop_type_add('belowprop', #{highlight: 'DiffAdd'})

diff --git a/src/version.c b/src/version.c
index 31d8404667aff96963e39f057740d441c853ab55..7bd94b0004e2cc773a4575451b4fa9331428807e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    162,
 /**/
     161,
 /**/