File tree 7 files changed +251
-201
lines changed
7 files changed +251
-201
lines changed Original file line number Diff line number Diff line change @@ -2029,7 +2029,6 @@ run_message_test: $(MESSAGE_TEST_TARGET)
2029
2029
test1 \
2030
2030
test_autocmd_option \
2031
2031
test_autoformat_join \
2032
- test_breakindent \
2033
2032
test_changelist \
2034
2033
test_close_count \
2035
2034
test_comparators \
@@ -2064,6 +2063,7 @@ test_arglist \
2064
2063
test_autochdir \
2065
2064
test_autocmd \
2066
2065
test_backspace_opt \
2066
+ test_breakindent \
2067
2067
test_bufwintabinfo \
2068
2068
test_cdo \
2069
2069
test_channel \
Original file line number Diff line number Diff line change @@ -3010,7 +3010,8 @@ win_line(
3010
3010
#endif
3011
3011
colnr_T trailcol = MAXCOL ; /* start of trailing spaces */
3012
3012
#ifdef FEAT_LINEBREAK
3013
- int need_showbreak = FALSE;
3013
+ int need_showbreak = FALSE; /* overlong line, skipping first x
3014
+ chars */
3014
3015
#endif
3015
3016
#if defined(FEAT_SIGNS ) || (defined(FEAT_QUICKFIX ) && defined(FEAT_WINDOWS )) \
3016
3017
|| defined(FEAT_SYN_HL ) || defined(FEAT_DIFF )
@@ -3793,13 +3794,15 @@ win_line(
3793
3794
if (draw_state == WL_BRI - 1 && n_extra == 0 )
3794
3795
{
3795
3796
draw_state = WL_BRI ;
3796
- if (wp -> w_p_bri && n_extra == 0 && row != startrow
3797
+ /* if need_showbreak is set, breakindent also applies */
3798
+ if (wp -> w_p_bri && n_extra == 0
3799
+ && (row != startrow || need_showbreak )
3797
3800
# ifdef FEAT_DIFF
3798
3801
&& filler_lines == 0
3799
3802
# endif
3800
3803
)
3801
3804
{
3802
- char_attr = 0 ; /* was: hl_attr(HLF_AT); */
3805
+ char_attr = 0 ;
3803
3806
# ifdef FEAT_DIFF
3804
3807
if (diff_hlf != (hlf_T )0 )
3805
3808
{
Original file line number Diff line number Diff line change @@ -75,7 +75,6 @@ SCRIPTS_ALL = \
75
75
test108.out \
76
76
test_autocmd_option.out \
77
77
test_autoformat_join.out \
78
- test_breakindent.out \
79
78
test_changelist.out \
80
79
test_close_count.out \
81
80
test_comparators.out \
@@ -141,6 +140,7 @@ NEW_TESTS = test_arglist.res \
141
140
test_assert.res \
142
141
test_autochdir.res \
143
142
test_backspace_opt.res \
143
+ test_breakindent.res \
144
144
test_bufwintabinfo.res \
145
145
test_cdo.res \
146
146
test_channel.res \
Load Diff This file was deleted.
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments