Merge remote-tracking branch 'upstream/master' into tabsidebar

runtime/autoload/gzip.vim

@@ -1,6 +1,6 @@
 " Vim autoload file for editing compressed files.
 " Maintainer:	The Vim Project <https://github.com/vim/vim>
-" Last Change:	2023 Aug 10
+" Last Change:	2024 Nov 25
 " Former Maintainer: Bram Moolenaar <[email protected]>
 
 " These functions are used by the gzip plugin.
@@ -148,6 +148,9 @@ fun gzip#read(cmd)
     else
       let fname = escape(expand("%:r"), " \t\n*?[{`$\\%#'\"|!<")
     endif
+    if filereadable(undofile(expand("%")))
+      exe "sil rundo " . fnameescape(undofile(expand("%")))
+    endif
     if &verbose >= 8
       execute "doau BufReadPost " . fname
     else

src/drawscreen.c

@@ -2273,6 +2273,7 @@ win_update(win_T *wp)
 				// match in fixed position might need redraw
 				// if lines were inserted or deleted
 				|| (wp->w_match_head != NULL
+						    && buf->b_mod_set
 						    && buf->b_mod_xlines != 0)
 #endif
 				))))
@@ -2554,8 +2555,8 @@ win_update(win_T *wp)
 	    // - 'number' is set and below inserted/deleted lines, or
 	    // - 'relativenumber' is set and cursor moved vertically,
 	    // the text doesn't need to be redrawn, but the number column does.
-	    if ((wp->w_p_nu && mod_top != 0
-			&& lnum >= mod_bot && buf->b_mod_xlines != 0)
+	    if ((wp->w_p_nu && mod_top != 0 && lnum >= mod_bot
+			&& buf->b_mod_set && buf->b_mod_xlines != 0)
 		    || (wp->w_p_rnu
 			&& wp->w_last_cursor_lnum_rnu != wp->w_cursor.lnum))
 	    {

src/version.c

@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    889,
 /**/
     888,
 /**/