From ef8706fb84cfe8bd58b1b26b0742e42caf09655b Mon Sep 17 00:00:00 2001 From: "K.Takata" Date: Mon, 31 May 2021 18:40:49 +0200 Subject: patch 8.2.2915: MS-Windows: when using "default" for encoding utf-8 is used Problem: MS-Windows: when using "default" for encoding utf-8 is used. Solution: Use the system encoding. (Ken Takata, closes #8300) --- src/mbyte.c | 5 +++++ src/version.c | 2 ++ 2 files changed, 7 insertions(+) (limited to 'src') diff --git a/src/mbyte.c b/src/mbyte.c index f3fdc32e8..697e58520 100644 --- a/src/mbyte.c +++ b/src/mbyte.c @@ -4453,8 +4453,13 @@ enc_canonize(char_u *enc) if (STRCMP(enc, "default") == 0) { +#ifdef MSWIN + // Use the system encoding, the default is always utf-8. + r = enc_locale(); +#else // Use the default encoding as it's found by set_init_1(). r = get_encoding_default(); +#endif if (r == NULL) r = (char_u *)ENC_DFLT; return vim_strsave(r); diff --git a/src/version.c b/src/version.c index 56ce53405..858477852 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2915, /**/ 2914, /**/ -- cgit v1.2.1