To: vim_dev@googlegroups.com
Subject: Patch 9.0.1608
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.0.1608
Problem:    update_topline() is called twice.
Solution:   Do not call update_topline() before curs_columns(). (Luuk van
            Baal, closes #12495)
Files:      src/window.c


*** ../vim-9.0.1607/src/window.c	2023-06-02 14:16:31.907127068 +0100
--- src/window.c	2023-06-05 14:57:16.235763546 +0100
***************
*** 7032,7042 ****
      }
  
      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;
  
--- 7032,7039 ----
      }
  
      if (wp == curwin)
  	curs_columns(FALSE);	// validate w_wrow
! 
      if (prev_height > 0)
  	wp->w_prev_fraction_row = wp->w_wrow;
  
***************
*** 7055,7067 ****
      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();
  	curs_columns(TRUE);	// validate w_wrow
! 	skip_update_topline = FALSE;
!     }
      redraw_win_later(wp, UPD_NOT_VALID);
      wp->w_redr_status = TRUE;
  }
--- 7052,7061 ----
      wp->w_lines_valid = 0;
      changed_line_abv_curs_win(wp);
      invalidate_botline_win(wp);
! 
!     if (wp == curwin && *p_spk == 'c')
  	curs_columns(TRUE);	// validate w_wrow
! 
      redraw_win_later(wp, UPD_NOT_VALID);
      wp->w_redr_status = TRUE;
  }
*** ../vim-9.0.1607/src/version.c	2023-06-04 19:29:18.636643905 +0100
--- src/version.c	2023-06-05 14:58:29.747636055 +0100
***************
*** 697,698 ****
--- 697,700 ----
  {   /* Add new patch number below this line */
+ /**/
+     1608,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
118. You are on a first-name basis with your ISP's staff.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///