diff options
| author | Sean Dewar <seandewar@users.noreply.github.com> | 2021-09-10 13:27:41 +0100 |
|---|---|---|
| committer | Sean Dewar <seandewar@users.noreply.github.com> | 2021-09-10 15:50:43 +0100 |
| commit | fd1dbb103bb78f04dd15b50f529bb12d922e98eb (patch) | |
| tree | ec13311830303ad6900d5b47dc556fd9c857c8fc /src/nvim/charset.c | |
| parent | aab3583e74fa3fd295bd367113be60965c748205 (diff) | |
| download | rneovim-fd1dbb103bb78f04dd15b50f529bb12d922e98eb.tar.gz rneovim-fd1dbb103bb78f04dd15b50f529bb12d922e98eb.tar.bz2 rneovim-fd1dbb103bb78f04dd15b50f529bb12d922e98eb.zip | |
vim-patch:8.1.2281: 'showbreak' cannot be set for one window
Problem: 'showbreak' cannot be set for one window.
Solution: Make 'showbreak' global-local.
https://github.com/vim/vim/commit/ee85702c10495041791f728e977b86005c4496e8
Change in oneleft() is N/A as the relevant condition was removed
(has_mbyte is always true for Nvim, so the condition was always false;
see commit 73dc9e9).
Use wp over curwin for curs_columns().
Required for v8.2.2903 (otherwise test fails as it'll leave the global
option set).
N/A patches for version.c:
vim-patch:8.1.2283: missed on use of p_sbr
Problem: Missed on use of p_sbr.
Solution: Add missing p_sbr change.
https://github.com/vim/vim/commit/91e22eb6e09ec384496fccde812072033fd9e616
Already ported in commit 43a874a.
Diffstat (limited to 'src/nvim/charset.c')
| -rw-r--r-- | src/nvim/charset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/charset.c b/src/nvim/charset.c index 0252ef4e9c..4725c0d08f 100644 --- a/src/nvim/charset.c +++ b/src/nvim/charset.c @@ -941,7 +941,7 @@ void getvcol(win_T *wp, pos_T *pos, colnr_T *start, colnr_T *cursor, // Also use this when 'list' is set but tabs take their normal size. if ((!wp->w_p_list || (wp->w_p_lcs_chars.tab1 != NUL)) && !wp->w_p_lbr - && (*p_sbr == NUL) + && *get_showbreak_value(wp) == NUL && !wp->w_p_bri ) { for (;;) { head = 0; |