diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-08-09 08:28:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-09 08:28:36 -0400 |
| commit | 9ef7003c38c3be31e47732256fd591b5884613d1 (patch) | |
| tree | 77b1224ff6ed6066b3b867085e694071dc4e0b03 /src/nvim/option.c | |
| parent | 68f61b167e71ca8dd42157b10b3096571c06f39d (diff) | |
| parent | 292148b08b56476af0dc688e8a82df7d8e33f699 (diff) | |
| download | rneovim-9ef7003c38c3be31e47732256fd591b5884613d1.tar.gz rneovim-9ef7003c38c3be31e47732256fd591b5884613d1.tar.bz2 rneovim-9ef7003c38c3be31e47732256fd591b5884613d1.zip | |
Merge pull request #15312 from janlazo/vim-8.2.2639
vim-patch:8.1.{1818},8.2.{1464,2639,2814,2947,2976,2986,3114,3141,3160,3198}
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index c3f9909b9d..0595776f79 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -7426,6 +7426,7 @@ static bool briopt_check(win_T *wp) int bri_shift = 0; int bri_min = 20; bool bri_sbr = false; + int bri_list = 0; char_u *p = wp->w_p_briopt; while (*p != NUL) @@ -7445,6 +7446,9 @@ static bool briopt_check(win_T *wp) { p += 3; bri_sbr = true; + } else if (STRNCMP(p, "list:", 5) == 0) { + p += 5; + bri_list = (int)getdigits(&p, false, 0); } if (*p != ',' && *p != NUL) { return false; @@ -7457,6 +7461,7 @@ static bool briopt_check(win_T *wp) wp->w_briopt_shift = bri_shift; wp->w_briopt_min = bri_min; wp->w_briopt_sbr = bri_sbr; + wp->w_briopt_list = bri_list; return true; } @@ -7669,6 +7674,12 @@ int win_signcol_configured(win_T *wp, int *is_fixed) return ret; } +// Get the local or global value of 'showbreak'. +char_u *get_showbreak_value(win_T *win FUNC_ATTR_UNUSED) +{ + return p_sbr; +} + /// Get window or buffer local options dict_T *get_winbuf_options(const int bufopt) FUNC_ATTR_WARN_UNUSED_RESULT |