diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-05-10 23:36:05 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-05-11 22:30:24 -0400 |
| commit | adcabb73bc48732df420e9de7b067ebba2f25f55 (patch) | |
| tree | 4426c137cbf62cc32ccdb442e9dab0c076a2f55c /src/nvim/screen.c | |
| parent | 801c8e06d60279d059073e0cf6901d43f6b3cc85 (diff) | |
| download | rneovim-adcabb73bc48732df420e9de7b067ebba2f25f55.tar.gz rneovim-adcabb73bc48732df420e9de7b067ebba2f25f55.tar.bz2 rneovim-adcabb73bc48732df420e9de7b067ebba2f25f55.zip | |
vim-patch:8.2.0309: window-local values have confusing name
Problem: Window-local values have confusing name.
Solution: Rename w_p_bri* to w_briopt_*.
https://github.com/vim/vim/commit/b81f56fb57c87a7490dd79908c257437d1958447
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 a165ce2586..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 && wp->w_p_brisbr) { + if (wp->w_skipcol > 0 && wp->w_p_wrap && wp->w_briopt_sbr) { need_showbreak = false; } // Correct end of highlighted area for 'breakindent', |