forked from aniani/vim
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)
This commit is contained in:
@@ -1407,6 +1407,9 @@ win_line(
|
|||||||
if (wp->w_p_bri && (wlv.row != startrow || need_showbreak)
|
if (wp->w_p_bri && (wlv.row != startrow || need_showbreak)
|
||||||
# ifdef FEAT_DIFF
|
# ifdef FEAT_DIFF
|
||||||
&& filler_lines == 0
|
&& filler_lines == 0
|
||||||
|
# endif
|
||||||
|
# ifdef FEAT_PROP_POPUP
|
||||||
|
&& !dont_use_showbreak
|
||||||
# endif
|
# endif
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
@@ -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#0000000#5fd7ff255|B|E|L|O|W| | +0&#ffffff0@52
|
||||||
| +0fd7ff255|A|L|S|O| |B|E|L|O|W| | +0&#ffffff0@47
|
| +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
|
|L|a|s|t| |l|i|n|e>.| +0&#ffff4012|A|f|t|e|r| |L|a|s|t| | +0&#ffffff0@37
|
||||||
|
@@ -2312,7 +2312,8 @@ func Test_props_with_text_after()
|
|||||||
|
|
||||||
let lines =<< trim END
|
let lines =<< trim END
|
||||||
set showbreak=+++
|
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('rightprop', #{highlight: 'ErrorMsg'})
|
||||||
call prop_type_add('afterprop', #{highlight: 'Search'})
|
call prop_type_add('afterprop', #{highlight: 'Search'})
|
||||||
call prop_type_add('belowprop', #{highlight: 'DiffAdd'})
|
call prop_type_add('belowprop', #{highlight: 'DiffAdd'})
|
||||||
|
@@ -735,6 +735,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
162,
|
||||||
/**/
|
/**/
|
||||||
161,
|
161,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user