diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-04-01 19:46:17 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-04-01 19:53:40 +0800 |
| commit | 139828cc7ee807cb6680c87bb2cec1aa90e8b4fd (patch) | |
| tree | ec777a018e90bc23b8b2e89e4d223a90e4bd0430 /src/nvim/edit.c | |
| parent | 377e87521157947c384d470a63927719b8c73ad7 (diff) | |
| download | rneovim-139828cc7ee807cb6680c87bb2cec1aa90e8b4fd.tar.gz rneovim-139828cc7ee807cb6680c87bb2cec1aa90e8b4fd.tar.bz2 rneovim-139828cc7ee807cb6680c87bb2cec1aa90e8b4fd.zip | |
vim-patch:8.2.4660: cursorcolumn is sometimes not correct
Problem: Cursorcolumn is sometimes not correct.
Solution: Recompute the cursor column when entering Insert mode and the
cursor is on a character wider than a screen cell.
https://github.com/vim/vim/commit/782c6744b49b30d9460ed00d4773666e42e07163
Diffstat (limited to 'src/nvim/edit.c')
| -rw-r--r-- | src/nvim/edit.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index a2687ada73..da0b577056 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -390,9 +390,13 @@ static void insert_enter(InsertState *s) trigger_modechanged(); stop_insert_mode = false; - // Need to recompute the cursor position, it might move when the cursor is - // on a TAB or special character. - curs_columns(curwin, true); + // Need to recompute the cursor position, it might move when the cursor + // is on a TAB or special character. + // ptr2cells() treats a TAB character as double-width. + if (ptr2cells(get_cursor_pos_ptr()) > 1) { + curwin->w_valid &= ~VALID_VIRTCOL; + curs_columns(curwin, true); + } // Enable langmap or IME, indicated by 'iminsert'. // Note that IME may enabled/disabled without us noticing here, thus the |