diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2025-03-19 07:34:02 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-18 23:34:02 +0000 |
| commit | 430d12a4fdc99a5f593d459994675ac17fc7c89c (patch) | |
| tree | c1d3adc5973567506355508c9d1e4ace7240a0ec /src/nvim/edit.c | |
| parent | 4d83649d1022a8956660b4ae83c28998cabfcfca (diff) | |
| download | rneovim-430d12a4fdc99a5f593d459994675ac17fc7c89c.tar.gz rneovim-430d12a4fdc99a5f593d459994675ac17fc7c89c.tar.bz2 rneovim-430d12a4fdc99a5f593d459994675ac17fc7c89c.zip | |
vim-patch:9.1.1221: Wrong cursor pos when leaving Insert mode just after 'autoindent' (#32976)
Problem: Wrong cursor position and '^' mark when leaving Insert mode
just after 'autoindent' and cursor on last char of line.
Solution: Don't move cursor to NUL when it wasn't moved to the left
(zeertzjq).
fixes: vim/vim#15581
related: neovim/neovim#30165 neovim/neovim#32943
closes: vim/vim#16922
https://github.com/vim/vim/commit/a3a7d10bfb9547991e04bcf12d1391deb8060754
Diffstat (limited to 'src/nvim/edit.c')
| -rw-r--r-- | src/nvim/edit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index c342764ced..f2001b6f6f 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -2390,6 +2390,7 @@ static void stop_insert(pos_T *end_insert_pos, int esc, int nomove) end_insert_pos->lnum)) && end_insert_pos->lnum <= curbuf->b_ml.ml_line_count) { pos_T tpos = curwin->w_cursor; + colnr_T prev_col = end_insert_pos->col; curwin->w_cursor = *end_insert_pos; check_cursor_col(curwin); // make sure it is not past the line @@ -2407,7 +2408,7 @@ static void stop_insert(pos_T *end_insert_pos, int esc, int nomove) } if (curwin->w_cursor.lnum != tpos.lnum) { curwin->w_cursor = tpos; - } else { + } else if (curwin->w_cursor.col < prev_col) { // reset tpos, could have been invalidated in the loop above tpos = curwin->w_cursor; tpos.col++; |