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 #10780)
diff --git a/src/window.c b/src/window.c
index 83cc24e..6be7369 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6781,6 +6781,8 @@
FOR_ALL_TAB_WINDOWS(tp, wp)
if ((do_curwin || wp != curwin) && wp->w_buffer == curbuf)
{
+ int need_adjust;
+
if (!nested)
{
// save the original cursor position and topline
@@ -6788,14 +6790,19 @@
wp->w_save_cursor.w_topline_save = wp->w_topline;
}
- if (wp->w_cursor.lnum > curbuf->b_ml.ml_line_count)
+ 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;
}
}