aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

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_*.
This commit is contained in:
Bram Moolenaar
2020-02-23 15:29:46 +01:00
parent 1aa76b8fd0
commit b81f56fb57
4 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/drawline.c
View File

@@ -1140,11 +1140,11 @@ win_line(
} }
#ifdef FEAT_LINEBREAK #ifdef FEAT_LINEBREAK
if (wp->w_p_brisbr && draw_state == WL_BRI - 1 if (wp->w_briopt_sbr && draw_state == WL_BRI - 1
&& n_extra == 0 && *get_showbreak_value(wp) != NUL) && n_extra == 0 && *get_showbreak_value(wp) != 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;
@@ -1176,7 +1176,7 @@ win_line(
c_final = NUL; c_final = NUL;
n_extra = get_breakindent_win(wp, n_extra = get_breakindent_win(wp,
ml_get_buf(wp->w_buffer, lnum, FALSE)); 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',
// required when 'linebreak' is also set. // required when 'linebreak' is also set.

16
src/indent.c
View File

@@ -875,9 +875,9 @@ briopt_check(win_T *wp)
++p; ++p;
} }
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 OK; return OK;
} }
@@ -927,10 +927,10 @@ get_breakindent_win(
(int)wp->w_buffer->b_p_ts, wp->w_p_list); (int)wp->w_buffer->b_p_ts, wp->w_p_list);
# endif # endif
} }
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(get_showbreak_value(wp)); bri -= vim_strsize(get_showbreak_value(wp));
// Add offset for number column, if 'n' is in 'cpoptions' // Add offset for number column, if 'n' is in 'cpoptions'
@@ -941,9 +941,9 @@ get_breakindent_win(
bri = 0; bri = 0;
// 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
else if (bri > eff_wwidth - wp->w_p_brimin) else if (bri > eff_wwidth - wp->w_briopt_min)
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;
} }

11
src/structs.h
View File

@@ -3340,15 +3340,16 @@ struct window_S
#ifdef FEAT_SYN_HL #ifdef FEAT_SYN_HL
int *w_p_cc_cols; // array of columns to highlight or NULL int *w_p_cc_cols; // array of columns to highlight or NULL
char_u w_p_culopt_flags; // flags for cursorline highlighting char_u w_p_culopt_flags; // flags for cursorline highlighting
#endif
#ifdef FEAT_LINEBREAK
int w_p_brimin; // minimum width for breakindent
int w_p_brishift; // additional shift for breakindent
int w_p_brisbr; // sbr in 'briopt'
#endif #endif
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
#ifdef FEAT_LINEBREAK
int w_briopt_min; // minimum width for breakindent
int w_briopt_shift; // additional shift for breakindent
int w_briopt_sbr; // sbr in 'briopt'
#endif
// 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))

2
src/version.c
View File

@@ -738,6 +738,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
309,
/**/ /**/
308, 308,
/**/ /**/