diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-02-23 15:29:46 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-02-23 15:29:46 +0100 |
commit | b81f56fb57c87a7490dd79908c257437d1958447 (patch) | |
tree | fa363ee5893351d602dea5245003629852a09d83 /src/indent.c | |
parent | 1aa76b8fd06c278fe36c39b0bbe7233c775d7423 (diff) | |
download | vim-git-b81f56fb57c87a7490dd79908c257437d1958447.tar.gz |
patch 8.2.0309: window-local values have confusing namev8.2.0309
Problem: Window-local values have confusing name.
Solution: Rename w_p_bri* to w_briopt_*.
Diffstat (limited to 'src/indent.c')
-rw-r--r-- | src/indent.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/indent.c b/src/indent.c index 1662292bb..10c82d89d 100644 --- a/src/indent.c +++ b/src/indent.c @@ -875,9 +875,9 @@ briopt_check(win_T *wp) ++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 @@ get_breakindent_win( (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 @@ get_breakindent_win( 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; } |