commit 5c606846b9a43c7e6b94c7e96838f7532792f557
author Luuk van Baal <luukvbaal@gmail.com> Mon Jun 05 15:00:05 2023 +0100
committer Bram Moolenaar <Bram@vim.org> Mon Jun 05 15:00:05 2023 +0100
tree 5e5f0a0b79d637e58032c3c04be6e071bf0ed6b2
parent 55daae392157823dc5434e6be1344f4336bfe96f

patch 9.0.1608: update_topline() is called twice

Problem:    update_topline() is called twice.
Solution:   Do not call update_topline() before curs_columns(). (Luuk van
            Baal, closes #12495)

src/window.c

diff --git a/src/window.c b/src/window.c
index eaf89aa..f02aa9f 100644
--- a/src/window.c
+++ b/src/window.c
@@ -7032,11 +7032,8 @@
     }
 
     if (wp == curwin)
-    {
-	if (get_scrolloff_value())
-	    update_topline();
 	curs_columns(FALSE);	// validate w_wrow
-    }
+
     if (prev_height > 0)
 	wp->w_prev_fraction_row = wp->w_wrow;
 
@@ -7055,13 +7052,10 @@
     wp->w_lines_valid = 0;
     changed_line_abv_curs_win(wp);
     invalidate_botline_win(wp);
-    if (wp == curwin)
-    {
-	skip_update_topline = (*p_spk != 'c');
-	update_topline();
+
+    if (wp == curwin && *p_spk == 'c')
 	curs_columns(TRUE);	// validate w_wrow
-	skip_update_topline = FALSE;
-    }
+
     redraw_win_later(wp, UPD_NOT_VALID);
     wp->w_redr_status = TRUE;
 }