# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1705079702 -3600
# Node ID 7d9358937eb9239149e46450452deed1c8ad5167
# Parent  d59bf8151c23b393c57e4dac79ada0ae738e2db6
patch 9.1.0024: z/OS (MVS) support can be improved

Commit: https://github.com/vim/vim/commit/497e5282b6d21b99c01c6ecc6bf41b9b1781df6a
Author: Igor Todorovski <itodorov@ca.ibm.com>
Date:   Fri Jan 12 17:59:18 2024 +0100

    patch 9.1.0024: z/OS (MVS) support can be improved

    Problem:  z/OS (MVS) support can be improved
    Solution: set UTF-8 as the default encoding for z/OS

    closes: #13821

    Signed-off-by: Igor Todorovski <itodorov@ca.ibm.com>
    Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/option.c b/src/option.c
--- a/src/option.c
+++ b/src/option.c
@@ -450,9 +450,10 @@ set_init_default_encoding(void)
     char_u	*p;
     int		opt_idx;
 
-# ifdef MSWIN
+# if defined(MSWIN) || defined(__MVS__)
     // MS-Windows has builtin support for conversion to and from Unicode, using
     // "utf-8" for 'encoding' should work best for most users.
+    // z/OS built should default to UTF-8 mode as setlocale does not respect utf-8 environment variable locales
     p = vim_strsave((char_u *)ENC_DFLT);
 # else
     // enc_locale() will try to find the encoding of the current locale.
diff --git a/src/option.h b/src/option.h
--- a/src/option.h
+++ b/src/option.h
@@ -130,7 +130,7 @@ typedef enum {
 #define ENC_UCSBOM	"ucs-bom"	// check for BOM at start of file
 
 // default value for 'encoding'
-#ifdef MSWIN
+#if defined(MSWIN) || defined(__MVS__)
 # define ENC_DFLT	"utf-8"
 #else
 # define ENC_DFLT	"latin1"
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    24,
+/**/
     23,
 /**/
     22,