IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06: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
No known key found for this signature in database
GPG Key ID: 64915E6E9F735B15
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/buffer_defs.h
View File

@ -1330,12 +1330,13 @@ struct window_S {
uint32_t w_p_fde_flags; // flags for 'foldexpr' uint32_t w_p_fde_flags; // flags for 'foldexpr'
uint32_t w_p_fdt_flags; // flags for 'foldtext' uint32_t w_p_fdt_flags; // flags for 'foldtext'
int *w_p_cc_cols; // array of columns to highlight or NULL int *w_p_cc_cols; // array of columns to highlight or NULL
int w_p_brimin; // minimum width for breakindent
int w_p_brishift; // additional shift for breakindent
bool w_p_brisbr; // sbr in 'briopt'
long w_p_siso; // 'sidescrolloff' local value long w_p_siso; // 'sidescrolloff' local value
long w_p_so; // 'scrolloff' local value long w_p_so; // 'scrolloff' local value
int w_briopt_min; // minimum width for breakindent
int w_briopt_shift; // additional shift for breakindent
bool w_briopt_sbr; // sbr in 'briopt'
// transform a pointer to a "onebuf" option into a "allbuf" option // transform a pointer to a "onebuf" option into a "allbuf" option
#define GLOBAL_WO(p) ((char *)p + sizeof(winopt_T)) #define GLOBAL_WO(p) ((char *)p + sizeof(winopt_T))

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_tick = buf_get_changedtick(wp->w_buffer);
prev_indent = get_indent_str(line, (int)wp->w_buffer->b_p_ts, wp->w_p_list); 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 // indent minus the length of the showbreak string
if (wp->w_p_brisbr) { if (wp->w_briopt_sbr) {
bri -= vim_strsize(p_sbr); bri -= vim_strsize(p_sbr);
} }
// Add offset for number column, if 'n' is in 'cpoptions' // 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 // never indent past left window margin
if (bri < 0) { if (bri < 0) {
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, // always leave at least bri_min characters on the left,
// if text width is sufficient // if text width is sufficient
bri = (eff_wwidth - wp->w_p_brimin < 0) bri = (eff_wwidth - wp->w_briopt_min < 0)
? 0 : eff_wwidth - wp->w_p_brimin; ? 0 : eff_wwidth - wp->w_briopt_min;
} }
return bri; return bri;

6
src/nvim/option.c
View File

@ -7229,9 +7229,9 @@ static bool briopt_check(win_T *wp)
} }
} }
wp->w_p_brishift = bri_shift; wp->w_briopt_shift = bri_shift;
wp->w_p_brimin = bri_min; wp->w_briopt_min = bri_min;
wp->w_p_brisbr = bri_sbr; wp->w_briopt_sbr = bri_sbr;
return true; return true;
} }

6
src/nvim/screen.c
View File

@ -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) { && n_extra == 0 && *p_sbr != NUL) {
// draw indent after showbreak value // draw indent after showbreak value
draw_state = WL_BRI; 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 // after the showbreak, draw the breakindent
draw_state = WL_BRI - 1; draw_state = WL_BRI - 1;
} }
@ -2994,7 +2994,7 @@ win_line (
c_final = NUL; c_final = NUL;
n_extra = n_extra =
get_breakindent_win(wp, ml_get_buf(wp->w_buffer, lnum, false)); 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; need_showbreak = false;
} }
// Correct end of highlighted area for 'breakindent', // Correct end of highlighted area for 'breakindent',