Mercurial > vim
changeset 4027:9ea81cd9b1f5 v7.3.768
updated for version 7.3.768
Problem: settabvar() and setwinvar() may move the cursor.
Solution: Save and restore the cursor position when appropriate. (idea by
Yasuhiro Matsumoto)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Thu, 17 Jan 2013 15:37:01 +0100 |
| parents | d7b049beee14 |
| children | 639564cb15a1 |
| files | src/edit.c src/version.c |
| diffstat | 2 files changed, 17 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/edit.c +++ b/src/edit.c @@ -372,6 +372,8 @@ edit(cmdchar, startln, count) */ if (cmdchar != 'r' && cmdchar != 'v') { + pos_T save_cursor = curwin->w_cursor; + # ifdef FEAT_EVAL if (cmdchar == 'R') ptr = (char_u *)"r"; @@ -382,6 +384,19 @@ edit(cmdchar, startln, count) set_vim_var_string(VV_INSERTMODE, ptr, 1); # endif apply_autocmds(EVENT_INSERTENTER, NULL, NULL, FALSE, curbuf); + + /* Since Insert mode was not started yet a call to check_cursor_col() + * may have moved the cursor, especially with the "A" command. */ + if (curwin->w_cursor.col != save_cursor.col + && curwin->w_cursor.lnum == save_cursor.lnum) + { + int save_state = State; + + curwin->w_cursor = save_cursor; + State = INSERT; + check_cursor_col(); + State = save_state; + } } #endif