diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-08-07 11:53:40 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-08-07 11:53:40 +0100 |
| commit | 73c3842fa54aa99e59b897b6ff1e69e800fe9cd3 (patch) | |
| tree | 0edcc21950a991de23f6a2c9445d3fc29523a90f | |
| parent | bf9158408a9d27932b8678f824cf1fe32d3cd920 (diff) | |
patch 9.0.0162: text property "below" gets indent if 'breakindent' is setv9.0.0162
Problem: Text property "below" gets indent if 'breakindent' is set. (Tim
Pope)
Solution: Do not put indent before text property. (closes #10859)
| -rw-r--r-- | src/drawline.c | 3 | ||||
| -rw-r--r-- | src/testdir/dumps/Test_prop_with_text_after_1.dump | 2 | ||||
| -rw-r--r-- | src/testdir/test_textprop.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/src/drawline.c b/src/drawline.c index 824c416e2d..eaae4bed36 100644 --- 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; 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 c64d1698d5..159e394619 100644 --- 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 | +0fd7ff255|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 8f3a304509..653db44152 100644 --- 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 31d8404667..7bd94b0004 100644 --- 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, |