aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFlorian Walch <florian@fwalch.com>2014-12-23 21:34:57 +0100
committerFlorian Walch <florian@fwalch.com>2014-12-23 21:35:50 +0100
commit89bab9b90e3730c5b7685e7a25c5ec3fb6b1d8c8 (patch)
tree1241514c026c05cdfedb2c5288dc96c3ce512239 /src
parentdf05574c97225aca59fa2de04a1516b9d070e654 (diff)
downloadrneovim-89bab9b90e3730c5b7685e7a25c5ec3fb6b1d8c8.tar.gz
rneovim-89bab9b90e3730c5b7685e7a25c5ec3fb6b1d8c8.tar.bz2
rneovim-89bab9b90e3730c5b7685e7a25c5ec3fb6b1d8c8.zip
vim-patch:7.4.520
Problem: Sun PCK locale is not recognzed. Solution: Add PCK in the table. (Keiichi Oono) https://code.google.com/p/vim/source/detail?r=v7-4-520
Diffstat (limited to 'src')
-rw-r--r--src/nvim/mbyte.c1
-rw-r--r--src/nvim/version.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c
index 26eda01f98..3274c8d8ec 100644
--- a/src/nvim/mbyte.c
+++ b/src/nvim/mbyte.c
@@ -347,6 +347,7 @@ enc_alias_table[] =
{"unix-jis", IDX_EUC_JP},
{"ujis", IDX_EUC_JP},
{"shift-jis", IDX_SJIS},
+ {"pck", IDX_SJIS}, /* Sun: PCK */
{"euckr", IDX_EUC_KR},
{"5601", IDX_EUC_KR}, /* Sun: KS C 5601 */
{"euccn", IDX_EUC_CN},
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 6b8ab7d007..059f1eb090 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -218,7 +218,7 @@ static int included_patches[] = {
//523 NA
//522,
//521,
- //520,
+ 520,
//519,
//518,
//517,