summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIgor Todorovski <itodorov@ca.ibm.com>2024-01-12 17:59:18 +0100
committerChristian Brabandt <cb@256bit.org>2024-01-12 17:59:18 +0100
commit497e5282b6d21b99c01c6ecc6bf41b9b1781df6a (patch)
tree77bf336e39600306a141a9138176da0588be914d /src
parent48a75f3dfb906a2d333a7b1c3545e2eb359596db (diff)
patch 9.1.0024: z/OS (MVS) support can be improvedv9.1.0024
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>
Diffstat (limited to 'src')
-rw-r--r--src/option.c3
-rw-r--r--src/option.h2
-rw-r--r--src/version.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/src/option.c b/src/option.c
index 2372c1aa9b..14447f59ba 100644
--- 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
index 646056bf11..0cf6a8cf6d 100644
--- 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
index 0099da595f..5fba3dec25 100644
--- 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,