diff options
Diffstat (limited to 'data/vim/patches/8.1.0111')
| -rw-r--r-- | data/vim/patches/8.1.0111 | 149 |
1 files changed, 149 insertions, 0 deletions
diff --git a/data/vim/patches/8.1.0111 b/data/vim/patches/8.1.0111 new file mode 100644 index 000000000..c8efeab6b --- /dev/null +++ b/data/vim/patches/8.1.0111 @@ -0,0 +1,149 @@ +To: vim_dev@googlegroups.com +Subject: Patch 8.1.0111 +Fcc: outbox +From: Bram Moolenaar <Bram@moolenaar.net> +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 8.1.0111 +Problem: .po files do not use recommended names. +Solution: Give a warning if the recommended name is not used. Accept the + recommended name for conversion. (Christian Brabandt, Ken Takata) +Files: src/po/Makefile, src/po/sjiscorr.c, src/po/check.vim + + +*** ../vim-8.1.0110/src/po/Makefile 2018-06-24 15:52:37.075719437 +0200 +--- src/po/Makefile 2018-06-24 17:58:04.858324254 +0200 +*************** +*** 87,93 **** + + ja.euc-jp.po: ja.po + iconv -f utf-8 -t euc-jp ja.po | \ +! sed -e 's/charset=utf-8/charset=euc-jp/' -e 's/# Original translations/# Generated from ja.po, DO NOT EDIT/' > ja.euc-jp.po + + # Convert cs.po to create cs.cp1250.po. + cs.cp1250.po: cs.po +--- 87,93 ---- + + ja.euc-jp.po: ja.po + iconv -f utf-8 -t euc-jp ja.po | \ +! sed -e 's/charset=[uU][tT][fF]-8/charset=euc-jp/' -e 's/# Original translations/# Generated from ja.po, DO NOT EDIT/' > ja.euc-jp.po + + # Convert cs.po to create cs.cp1250.po. + cs.cp1250.po: cs.po +*************** +*** 105,111 **** + pl.UTF-8.po: pl.po + rm -f pl.UTF-8.po + iconv -f iso-8859-2 -t utf-8 pl.po | \ +! sed -e 's/charset=ISO-8859-2/charset=utf-8/' -e 's/# Original translations/# Generated from pl.po, DO NOT EDIT/' > pl.UTF-8.po + + # Convert sk.po to create sk.cp1250.po. + sk.cp1250.po: sk.po +--- 105,111 ---- + pl.UTF-8.po: pl.po + rm -f pl.UTF-8.po + iconv -f iso-8859-2 -t utf-8 pl.po | \ +! sed -e 's/charset=ISO-8859-2/charset=UTF-8/' -e 's/# Original translations/# Generated from pl.po, DO NOT EDIT/' > pl.UTF-8.po + + # Convert sk.po to create sk.cp1250.po. + sk.cp1250.po: sk.po +*************** +*** 119,125 **** + zh_CN.cp936.po: zh_CN.UTF-8.po + rm -f zh_CN.cp936.po + iconv -f UTF-8 -t cp936 zh_CN.UTF-8.po | \ +! sed -e 's/charset=utf-8/charset=gbk/' -e 's/# Original translations/# Generated from zh_CN.UTF-8.po, DO NOT EDIT/' > zh_CN.cp936.po + + # Convert ko.UTF-8.po to create ko.po. + ko.po: ko.UTF-8.po +--- 119,125 ---- + zh_CN.cp936.po: zh_CN.UTF-8.po + rm -f zh_CN.cp936.po + iconv -f UTF-8 -t cp936 zh_CN.UTF-8.po | \ +! sed -e 's/charset=[uU][tT][fF]-8/charset=gbk/' -e 's/# Original translations/# Generated from zh_CN.UTF-8.po, DO NOT EDIT/' > zh_CN.cp936.po + + # Convert ko.UTF-8.po to create ko.po. + ko.po: ko.UTF-8.po +*** ../vim-8.1.0110/src/po/sjiscorr.c 2016-01-31 17:13:47.000000000 +0100 +--- src/po/sjiscorr.c 2018-06-24 17:58:04.858324254 +0200 +*************** +*** 16,22 **** + { + for (p = buffer; *p != 0; p++) + { +! if (strncmp(p, "charset=utf-8", 13) == 0) + { + fputs("charset=cp932", stdout); + p += 12; +--- 16,23 ---- + { + for (p = buffer; *p != 0; p++) + { +! if (strncmp(p, "charset=utf-8", 13) == 0 +! || strncmp(p, "charset=UTF-8", 13) == 0) + { + fputs("charset=cp932", stdout); + p += 12; +*** ../vim-8.1.0110/src/po/check.vim 2018-05-08 16:05:44.000000000 +0200 +--- src/po/check.vim 2018-06-24 17:57:34.634490594 +0200 +*************** +*** 173,184 **** +--- 173,209 ---- + " We allow for a stray plural header, msginit adds one. + endif + ++ " Check that 8bit encoding is used instead of 8-bit ++ let cte = search('^"Content-Transfer-Encoding:\s\+8-bit', 'n') ++ let ctc = search('^"Content-Type:.*;\s\+\<charset=[iI][sS][oO]_', 'n') ++ let ctu = search('^"Content-Type:.*;\s\+\<charset=utf-8', 'n') ++ if cte ++ echomsg "Content-Transfer-Encoding should be 8bit instead of 8-bit" ++ " TODO: make this an error ++ " if error == 0 ++ " let error = cte ++ " endif ++ elseif ctc ++ echomsg "Content-Type charset should be 'ISO-...' instead of 'ISO_...'" ++ " TODO: make this an error ++ " if error == 0 ++ " let error = ct ++ " endif ++ elseif ctu ++ echomsg "Content-Type charset should be 'UTF-8' instead of 'utf-8'" ++ " TODO: make this an error ++ " if error == 0 ++ " let error = ct ++ " endif ++ endif ++ + + if error == 0 + " If all was OK restore the view. + call winrestview(wsv) + echomsg "OK" + else ++ " Put the cursor on the line with the error. + exe error + endif + +*** ../vim-8.1.0110/src/version.c 2018-06-24 16:53:31.649909925 +0200 +--- src/version.c 2018-06-24 18:04:11.412305463 +0200 +*************** +*** 791,792 **** +--- 791,794 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 111, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +104. When people ask about the Presidential Election you ask "Which country?" + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |