diff options
| -rw-r--r-- | src/edit.c | 15 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/edit.c b/src/edit.c index 0d9409546..50c1fca6b 100644 --- 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 diff --git a/src/version.c b/src/version.c index 321740010..251cec813 100644 --- a/src/version.c +++ b/src/version.c @@ -726,6 +726,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 768, +/**/ 767, /**/ 766, |