Update vim-version to 9.1.2050 from 9.1.1830

buildenv

@@ -1,5 +1,5 @@
 # bump: vim-version /VIM_VERSION="(.*)"/ https://github.com/vim/vim.git|semver:*|re:/([\d]+).([\d]+).([\d][\d][\d]*0+)/$1.$2.$3/
-VIM_VERSION="9.1.1830"
+VIM_VERSION="9.1.2050"
 
 export ZOPEN_BUILD_LINE="STABLE"
 export ZOPEN_CATEGORIES="editor development"

stable-patches/buffwrite.c.patch

@@ -1,26 +1,27 @@
-diff --git i/src/bufwrite.c w/src/bufwrite.c
-index e88c7b8..8fa43c1 100644
---- i/src/bufwrite.c
-+++ w/src/bufwrite.c
-@@ -12,6 +12,9 @@
+diff --git a/src/bufwrite.c b/src/bufwrite.c
+index 77efb30..2a04947 100644
+--- a/src/bufwrite.c
++++ b/src/bufwrite.c
+@@ -12,6 +12,10 @@
   */
 
  #include "vim.h"
 +#ifdef __MVS__
-+#include "dio.h"
++# include "dio.h"
++# include <zos.h>
 +#endif
 
  #if defined(HAVE_UTIME) && defined(HAVE_UTIME_H)
  # include <utime.h>		// for struct utimbuf
-@@ -1857,7 +1860,6 @@ buf_write(
+@@ -1873,7 +1877,6 @@ buf_write(
  			}
  		    }
  		}
 -
  restore_backup:
  		{
  		    stat_T	st;
-@@ -1898,6 +1900,21 @@ restore_backup:
+@@ -1914,6 +1917,21 @@ restore_backup:
  		    vim_free(wfname);
  		goto fail;
  	    }
@@ -42,7 +43,7 @@ index e88c7b8..8fa43c1 100644
  	    write_info.bw_fd = fd;
 
  #if defined(UNIX)
-@@ -2518,6 +2535,44 @@ restore_backup:
+@@ -2535,6 +2553,44 @@ restore_backup:
  	    && mch_remove(backup) != 0)
  	emsg(_(e_cant_delete_backup_file));
 

stable-patches/fileio.c.patch

@@ -1,8 +1,18 @@
-diff --git i/src/fileio.c w/src/fileio.c
-index 5771a45..c419bb0 100644
---- i/src/fileio.c
-+++ w/src/fileio.c
-@@ -495,6 +495,9 @@ readfile(
+diff --git a/src/fileio.c b/src/fileio.c
+index 8156b80..295dd2f 100644
+--- a/src/fileio.c
++++ b/src/fileio.c
+@@ -23,6 +23,9 @@
+ #if defined(VMS) && defined(HAVE_XOS_R_H)
+ # include <x11/xos_r.h>
+ #endif
++#if defined(__MVS__)
++# include <zos.h>
++#endif
+
+ // Is there any system that doesn't have access()?
+ #define USE_MCH_ACCESS
+@@ -495,6 +498,9 @@ readfile(
  				mch_access((char *)fname, W_OK))
  	    file_readonly = TRUE;
  	fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0);
@@ -12,7 +22,7 @@ index 5771a45..c419bb0 100644
  #else
  	if (!newfile
  		|| readonlymode
-@@ -2741,6 +2744,21 @@ failed:
+@@ -2741,6 +2747,21 @@ failed:
      if (!(recoverymode && error))
  	retval = OK;
 
@@ -34,7 +44,7 @@ index 5771a45..c419bb0 100644
  theend:
      if (curbuf->b_ml.ml_mfp != NULL
  		       && curbuf->b_ml.ml_mfp->mf_dirty == MF_DIRTY_YES_NOSYNC)
-@@ -4202,6 +4220,62 @@ buf_check_timestamp(
+@@ -4201,6 +4222,62 @@ buf_check_timestamp(
 
      set_bufref(&bufref, buf);
 

stable-patches/vim.h.patch

@@ -1,12 +1,12 @@
 diff --git a/src/vim.h b/src/vim.h
-index 9c1434cc6..748c3ae25 100644
+index 4bd6c70..41bf65b 100644
 --- a/src/vim.h
 +++ b/src/vim.h
-@@ -283,6 +283,7 @@
+@@ -316,6 +316,7 @@
  // a concrete example, gcc-3.2 enforces exception specifications, and
  // glibc-2.2.5 has them in their system headers.
  #if !defined(__cplusplus) && defined(UNIX) \
-+  && !defined(__MVS__) \
- 	&& !defined(MACOS_X) // MACOS_X doesn't yet support osdef.h
++       && !defined(__MVS__) \
+        && !defined(MACOS_X) // MACOS_X doesn't yet support osdef.h
  # include "auto/osdef.h"	// bring missing declarations in
  #endif

stable-patches/xxd.c.patch

@@ -1,8 +1,19 @@
-diff --git i/src/xxd/xxd.c w/src/xxd/xxd.c
-index b46cee41f..252c864d6 100644
---- i/src/xxd/xxd.c
-+++ w/src/xxd/xxd.c
-@@ -1015,6 +1015,11 @@ main(int argc, char *argv[])
+diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
+index ddc11ee..54c5db2 100644
+--- a/src/xxd/xxd.c
++++ b/src/xxd/xxd.c
+@@ -117,7 +117,9 @@
+ # include <unix.h>	/* for fdopen() on MAC */
+ #endif
+
+-
++#ifdef __MVS__
++# include <zos.h>
++#endif
+ /*  This corrects the problem of missing prototypes for certain functions
+  *  in some GNU installations (e.g. SunOS 4.1.x).
+  *  Darren Hiebert <[email protected]> (sparc-sun-sunos4.1.3_U1/2.7.2.2)
+@@ -1016,6 +1018,11 @@ main(int argc, char *argv[])
        rewind(fpo);
      }