aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Walch <florian@fwalch.com>2014-12-23 21:34:30 +0100
committerFlorian Walch <florian@fwalch.com>2014-12-23 21:34:38 +0100
commitdf05574c97225aca59fa2de04a1516b9d070e654 (patch)
tree527e8292eef5fceb809cc375eb73a1a748aec5dd
parentaa08632caf80d2259d94e8f6e30cd806e3c05a1d (diff)
downloadrneovim-df05574c97225aca59fa2de04a1516b9d070e654.tar.gz
rneovim-df05574c97225aca59fa2de04a1516b9d070e654.tar.bz2
rneovim-df05574c97225aca59fa2de04a1516b9d070e654.zip
vim-patch:7.4.508
Problem: When generating ja.sjis.po the header is not correctly adjusted. Solution: Check for the right header string. (Ken Takata) https://code.google.com/p/vim/source/detail?r=v7-4-508
-rw-r--r--src/nvim/po/sjiscorr.c3
-rw-r--r--src/nvim/version.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/nvim/po/sjiscorr.c b/src/nvim/po/sjiscorr.c
index bce3477b90..ebcbe16dee 100644
--- a/src/nvim/po/sjiscorr.c
+++ b/src/nvim/po/sjiscorr.c
@@ -19,9 +19,8 @@ int main(int argc, char **argv)
fputs("charset=cp932", stdout);
p += 12;
}
- else if (strncmp(p, "ja.po - Japanese message file", 29) == 0)
+ else if (strncmp(p, "# Original translations", 23) == 0)
{
- fputs("ja.sjis.po - Japanese message file for Vim (version 6.x)\n", stdout);
fputs("# generated from ja.po, DO NOT EDIT", stdout);
while (p[1] != '\n')
++p;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 91f160d83f..6b8ab7d007 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -230,7 +230,7 @@ static int included_patches[] = {
//511 NA
//510 NA
//509,
- //508,
+ 508,
//507 NA
//506 NA
//505 NA