mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-15 07:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.0309: window-local values have confusing name

Browse Source 
Problem:    Window-local values have confusing name.
Solution:   Rename w_p_bri* to w_briopt_*.
b81f56fb57
This commit is contained in:
Jan Edmund Lazo
2020-05-10 23:36:05 -04:00
parent 801c8e06d6
commit adcabb73bc
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/indent.c
View File

@@ -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;