diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbyte.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 0 deletions
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 @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2915, +/**/ 2914, /**/ 2913, |