Skip to content

Commit 6c89686

Browse files
committed
patch 8.0.0090
Problem: Test_help_complete sometimes fails in MS-Windows console. Solution: Use getcompletion() instead of feedkeys() and command line completion. (Hirohito Higashi)
1 parent a859f04 commit 6c89686

File tree

7 files changed

+251
-201
lines changed

7 files changed

+251
-201
lines changed

src/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2029,7 +2029,6 @@ run_message_test: $(MESSAGE_TEST_TARGET)
20292029
test1 \
20302030
test_autocmd_option \
20312031
test_autoformat_join \
2032-
test_breakindent \
20332032
test_changelist \
20342033
test_close_count \
20352034
test_comparators \
@@ -2064,6 +2063,7 @@ test_arglist \
20642063
test_autochdir \
20652064
test_autocmd \
20662065
test_backspace_opt \
2066+
test_breakindent \
20672067
test_bufwintabinfo \
20682068
test_cdo \
20692069
test_channel \

src/screen.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3010,7 +3010,8 @@ win_line(
30103010
#endif
30113011
colnr_T trailcol = MAXCOL; /* start of trailing spaces */
30123012
#ifdef FEAT_LINEBREAK
3013-
int need_showbreak = FALSE;
3013+
int need_showbreak = FALSE; /* overlong line, skipping first x
3014+
chars */
30143015
#endif
30153016
#if defined(FEAT_SIGNS) || (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS)) \
30163017
|| defined(FEAT_SYN_HL) || defined(FEAT_DIFF)
@@ -3793,13 +3794,15 @@ win_line(
37933794
if (draw_state == WL_BRI - 1 && n_extra == 0)
37943795
{
37953796
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)
37973800
# ifdef FEAT_DIFF
37983801
&& filler_lines == 0
37993802
# endif
38003803
)
38013804
{
3802-
char_attr = 0; /* was: hl_attr(HLF_AT); */
3805+
char_attr = 0;
38033806
# ifdef FEAT_DIFF
38043807
if (diff_hlf != (hlf_T)0)
38053808
{

src/testdir/Make_all.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ SCRIPTS_ALL = \
7575
test108.out \
7676
test_autocmd_option.out \
7777
test_autoformat_join.out \
78-
test_breakindent.out \
7978
test_changelist.out \
8079
test_close_count.out \
8180
test_comparators.out \
@@ -141,6 +140,7 @@ NEW_TESTS = test_arglist.res \
141140
test_assert.res \
142141
test_autochdir.res \
143142
test_backspace_opt.res \
143+
test_breakindent.res \
144144
test_bufwintabinfo.res \
145145
test_cdo.res \
146146
test_channel.res \

src/testdir/test_breakindent.in

Lines changed: 0 additions & 122 deletions
This file was deleted.

src/testdir/test_breakindent.ok

Lines changed: 0 additions & 74 deletions
This file was deleted.

0 commit comments

Comments
 (0)