vim-patch:9.0.0094: cursor restored unexpected with nested autocommand

Problem:    Cursor restored unexpected with nested autocommand.
Solution:   Do not restore the cursor when it was moved intentionally.
            (closes vim/vim#10780)
https://github.com/vim/vim/commit/3d6ee8bda0550a01346f5992bbce09c0eb6d7569

2 files changed, 24 insertions, 6 deletions

diff --git a/src/nvim/testdir/test_autocmd.vim b/src/nvim/testdir/test_autocmd.vim
index 7645a27fdf..1c2f86a584 100644
--- a/src/nvim/testdir/test_autocmd.vim
+++ b/src/nvim/testdir/test_autocmd.vim
@@ -2190,6 +2190,17 @@ func Test_autocmd_nested_cursor_invalid()
   bwipe!
 endfunc
 
+func Test_autocmd_nested_keeps_cursor_pos()
+  enew
+  call setline(1, 'foo')
+  autocmd User foo ++nested normal! $a
+  autocmd InsertLeave * :
+  doautocmd User foo
+  call assert_equal([0, 1, 3, 0], getpos('.'))
+
+  bwipe!
+endfunc
+
 func Test_autocmd_nested_switch_window()
   " run this in a separate Vim so that SafeState works
   CheckRunVimInTerminal
diff --git a/src/nvim/window.c b/src/nvim/window.c
index a825a77f5f..b2812189d9 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -6866,16 +6866,23 @@ static void check_lnums_both(bool do_curwin, bool nested)
         wp->w_save_cursor.w_topline_save = wp->w_topline;
       }
 
-      if (wp->w_cursor.lnum > curbuf->b_ml.ml_line_count) {
+      bool need_adjust = wp->w_cursor.lnum > curbuf->b_ml.ml_line_count;
+      if (need_adjust) {
         wp->w_cursor.lnum = curbuf->b_ml.ml_line_count;
       }
-      if (wp->w_topline > curbuf->b_ml.ml_line_count) {
-        wp->w_topline = curbuf->b_ml.ml_line_count;
+      if (need_adjust || !nested) {
+        // save the (corrected) cursor position
+        wp->w_save_cursor.w_cursor_corr = wp->w_cursor;
       }
 
-      // save the (corrected) cursor position and topline
-      wp->w_save_cursor.w_cursor_corr = wp->w_cursor;
-      wp->w_save_cursor.w_topline_corr = wp->w_topline;
+      need_adjust = wp->w_topline > curbuf->b_ml.ml_line_count;
+      if (need_adjust) {
+        wp->w_topline = curbuf->b_ml.ml_line_count;
+      }
+      if (need_adjust || !nested) {
+        // save the (corrected) topline
+        wp->w_save_cursor.w_topline_corr = wp->w_topline;
+      }
     }
   }
 }