changeset 29643:b54dfe92ee10 v9.0.0162

patch 9.0.0162: text property "below" gets indent if 'breakindent' is set Commit: https://github.com/vim/vim/commit/73c3842fa54aa99e59b897b6ff1e69e800fe9cd3 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Aug 7 11:53:40 2022 +0100 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)
author Bram Moolenaar <Bram@vim.org>
date Sun, 07 Aug 2022 13:00:15 +0200
parents d2b2f8b68e22
children b73d91f287ae
files src/drawline.c src/testdir/dumps/Test_prop_with_text_after_1.dump src/testdir/test_textprop.vim src/version.c
diffstat 4 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -1408,6 +1408,9 @@ win_line(
 # ifdef FEAT_DIFF
 			&& filler_lines == 0
 # endif
+# ifdef FEAT_PROP_POPUP
+			&& !dont_use_showbreak
+# endif
 		   )
 		{
 		    wlv.char_attr = 0;
--- 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
--- 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'})
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    162,
+/**/
     161,
 /**/
     160,