Mercurial > vim
diff src/screen.c @ 10392:957a1d560bda v8.0.0090
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Nov 17 19:46:51 2016 +0100
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)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 17 Nov 2016 20:00:05 +0100 |
| parents | cf988222b150 |
| children | 34b50194f82d |
line wrap: on
line diff
--- a/src/screen.c +++ b/src/screen.c @@ -3010,7 +3010,8 @@ win_line( #endif colnr_T trailcol = MAXCOL; /* start of trailing spaces */ #ifdef FEAT_LINEBREAK - int need_showbreak = FALSE; + int need_showbreak = FALSE; /* overlong line, skipping first x + chars */ #endif #if defined(FEAT_SIGNS) || (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS)) \ || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) @@ -3793,13 +3794,15 @@ win_line( if (draw_state == WL_BRI - 1 && n_extra == 0) { draw_state = WL_BRI; - if (wp->w_p_bri && n_extra == 0 && row != startrow + /* if need_showbreak is set, breakindent also applies */ + if (wp->w_p_bri && n_extra == 0 + && (row != startrow || need_showbreak) # ifdef FEAT_DIFF && filler_lines == 0 # endif ) { - char_attr = 0; /* was: hl_attr(HLF_AT); */ + char_attr = 0; # ifdef FEAT_DIFF if (diff_hlf != (hlf_T)0) {