summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-09-07 16:07:47 +0200
committerBram Moolenaar <Bram@vim.org>2019-09-07 16:07:47 +0200
commitfa90d70884ee208966b84052080a7d5eeb8ac2d5 (patch)
treeb0a30fe0e78bd7d86263fe1ded994eeeed8acbc8
parent9b1cd65d8b063cade214043c39560b289f84ef8b (diff)
downloadvim-git-fa90d70884ee208966b84052080a7d5eeb8ac2d5.tar.gz
patch 8.1.2003: MS-Windows: code page 65001 is not recognizedv8.1.2003
Problem: MS-Windows: code page 65001 is not recognized. Solution: Use utf-8 for code page 65001. (Dan Thompson, closes #4902)
-rw-r--r--src/mbyte.c4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/mbyte.c b/src/mbyte.c
index 808194f79..ff23ab6af 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -4468,8 +4468,10 @@ enc_locale(void)
if (acp == 1200)
STRCPY(buf, "ucs-2le");
- else if (acp == 1252) /* cp1252 is used as latin1 */
+ else if (acp == 1252) // cp1252 is used as latin1
STRCPY(buf, "latin1");
+ else if (acp == 65001)
+ STRCPY(buf, "utf-8");
else
sprintf(buf, "cp%ld", acp);
diff --git a/src/version.c b/src/version.c
index 7f3310e2c..80976779a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2003,
+/**/
2002,
/**/
2001,