diff options
| author | James McCoy <jamessan@jamessan.com> | 2020-05-15 10:36:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-15 10:36:32 -0400 |
| commit | e2a33a6622193df383870903cd39a3080c890d4d (patch) | |
| tree | d92783cac8745057428b5f0e27094acb60c49d53 /src/nvim/screen.c | |
| parent | da6f38ab3cd87615e212b83ff9bbb9d585e4768e (diff) | |
| parent | 076b0949d045d19decb2625c04128200ce8a987f (diff) | |
| download | rneovim-e2a33a6622193df383870903cd39a3080c890d4d.tar.gz rneovim-e2a33a6622193df383870903cd39a3080c890d4d.tar.bz2 rneovim-e2a33a6622193df383870903cd39a3080c890d4d.zip | |
Merge pull request #12259 from janlazo/vim-8.1.1186
Diffstat (limited to 'src/nvim/screen.c')
| -rw-r--r-- | src/nvim/screen.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 8f8bfee60c..9e958663aa 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -2966,11 +2966,11 @@ win_line ( } } - if (wp->w_p_brisbr && draw_state == WL_BRI - 1 + if (wp->w_briopt_sbr && draw_state == WL_BRI - 1 && n_extra == 0 && *p_sbr != NUL) { // draw indent after showbreak value draw_state = WL_BRI; - } else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) { + } else if (wp->w_briopt_sbr && draw_state == WL_SBR && n_extra == 0) { // after the showbreak, draw the breakindent draw_state = WL_BRI - 1; } @@ -2994,7 +2994,7 @@ win_line ( c_final = NUL; n_extra = get_breakindent_win(wp, ml_get_buf(wp->w_buffer, lnum, false)); - if (wp->w_skipcol > 0 && wp->w_p_wrap) { + if (wp->w_skipcol > 0 && wp->w_p_wrap && wp->w_briopt_sbr) { need_showbreak = false; } // Correct end of highlighted area for 'breakindent', |