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_*.
diff --git a/src/indent.c b/src/indent.c
index 1662292..10c82d8 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -875,9 +875,9 @@
++p;
}
- wp->w_p_brishift = bri_shift;
- wp->w_p_brimin = bri_min;
- wp->w_p_brisbr = bri_sbr;
+ wp->w_briopt_shift = bri_shift;
+ wp->w_briopt_min = bri_min;
+ wp->w_briopt_sbr = bri_sbr;
return OK;
}
@@ -927,10 +927,10 @@
(int)wp->w_buffer->b_p_ts, wp->w_p_list);
# endif
}
- 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(get_showbreak_value(wp));
// Add offset for number column, if 'n' is in 'cpoptions'
@@ -941,9 +941,9 @@
bri = 0;
// always leave at least bri_min characters on the left,
// if text width is sufficient
- else if (bri > eff_wwidth - wp->w_p_brimin)
- bri = (eff_wwidth - wp->w_p_brimin < 0)
- ? 0 : eff_wwidth - wp->w_p_brimin;
+ else if (bri > eff_wwidth - wp->w_briopt_min)
+ bri = (eff_wwidth - wp->w_briopt_min < 0)
+ ? 0 : eff_wwidth - wp->w_briopt_min;
return bri;
}