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/indent.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/indent.c')
-rw-r--r-- | src/nvim/indent.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/indent.c b/src/nvim/indent.c index 7f17fb0035..fb277b25fd 100644 --- a/src/nvim/indent.c +++ b/src/nvim/indent.c @@ -398,10 +398,10 @@ int get_breakindent_win(win_T *wp, const char_u *line) prev_tick = buf_get_changedtick(wp->w_buffer); prev_indent = get_indent_str(line, (int)wp->w_buffer->b_p_ts, wp->w_p_list); } - bri = prev_indent + wp->w_p_brishift; + bri = prev_indent + wp->w_briopt_shift; // indent minus the length of the showbreak string - if (wp->w_p_brisbr) { + if (wp->w_briopt_sbr) { bri -= vim_strsize(p_sbr); } // Add offset for number column, if 'n' is in 'cpoptions' @@ -410,11 +410,11 @@ int get_breakindent_win(win_T *wp, const char_u *line) // never indent past left window margin if (bri < 0) { bri = 0; - } else if (bri > eff_wwidth - wp->w_p_brimin) { + } else if (bri > eff_wwidth - wp->w_briopt_min) { // always leave at least bri_min characters on the left, // if text width is sufficient - bri = (eff_wwidth - wp->w_p_brimin < 0) - ? 0 : eff_wwidth - wp->w_p_brimin; + bri = (eff_wwidth - wp->w_briopt_min < 0) + ? 0 : eff_wwidth - wp->w_briopt_min; } return bri; |