diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-07-06 11:07:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-06 11:07:23 +0800 |
| commit | 25e62697c32e43d978e43776f9a01cd62bfe83be (patch) | |
| tree | 2bcede00c7cef91d3b18cdf9dcc5f27b51b390b3 /src | |
| parent | a0c9c04f006dbc6cb38d620ec036e32ccb8e76cc (diff) | |
| download | rneovim-25e62697c32e43d978e43776f9a01cd62bfe83be.tar.gz rneovim-25e62697c32e43d978e43776f9a01cd62bfe83be.tar.bz2 rneovim-25e62697c32e43d978e43776f9a01cd62bfe83be.zip | |
fix(column): fix wrong cursor with 'statuscolumn' and cpo+=n (#24268)
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/drawline.c | 2 | ||||
| -rw-r--r-- | src/nvim/move.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c index fbce0914cb..029a89f109 100644 --- a/src/nvim/drawline.c +++ b/src/nvim/drawline.c @@ -748,7 +748,7 @@ static void get_statuscol_display_info(statuscol_T *stcp, winlinevars_T *wlv) // Skip over empty highlight sections } while (wlv->n_extra == 0 && stcp->textp < stcp->text_end); if (wlv->n_extra > 0) { - static char transbuf[MAX_NUMBERWIDTH * MB_MAXBYTES + 1]; + static char transbuf[(MAX_NUMBERWIDTH + 9 + 9 * 2) * MB_MAXBYTES + 1]; wlv->n_extra = (int)transstr_buf(wlv->p_extra, wlv->n_extra, transbuf, sizeof transbuf, true); wlv->p_extra = transbuf; } diff --git a/src/nvim/move.c b/src/nvim/move.c index 873ef6c417..03d7f95bba 100644 --- a/src/nvim/move.c +++ b/src/nvim/move.c @@ -775,9 +775,9 @@ void validate_cursor_col(void) // fold column and sign column (these don't move when scrolling horizontally). int win_col_off(win_T *wp) { - return ((wp->w_p_nu || wp->w_p_rnu || (*wp->w_p_stc != NUL)) ? + return ((wp->w_p_nu || wp->w_p_rnu || *wp->w_p_stc != NUL) ? (number_width(wp) + (*wp->w_p_stc == NUL)) : 0) - + (cmdwin_type == 0 || wp != curwin ? 0 : 1) + + ((cmdwin_type == 0 || wp != curwin) ? 0 : 1) + win_fdccol_count(wp) + (win_signcol_count(wp) * win_signcol_width(wp)); } @@ -792,8 +792,9 @@ int curwin_col_off(void) // is in 'cpoptions'. int win_col_off2(win_T *wp) { - if ((wp->w_p_nu || wp->w_p_rnu) && vim_strchr(p_cpo, CPO_NUMCOL) != NULL) { - return number_width(wp) + 1; + if ((wp->w_p_nu || wp->w_p_rnu || *wp->w_p_stc != NUL) + && vim_strchr(p_cpo, CPO_NUMCOL) != NULL) { + return number_width(wp) + (*wp->w_p_stc == NUL); } return 0; } |