merge cron-vars-79981.patch patch into vixie.patch

[packages/vim.git] / vim-locales.patch

diff --git a/vim-locales.patch b/vim-locales.patch
index 9e4eb254c0631297ad164b19dddf1277bc4ced6c..b72a8bc84219e119761c47a8737136c25f6e1640 100644 (file)
--- a/vim-locales.patch
+++ b/vim-locales.patch
@@ -1,9 +1,12 @@
---- vim72/src/po/Makefile.orig 2009-04-26 13:48:02.165042621 +0200
-+++ vim72/src/po/Makefile      2009-04-26 13:48:27.241706378 +0200
-@@ -18,7 +18,6 @@
+--- vim73/src/po/Makefile~     2013-02-22 17:47:17.000000000 +0200
++++ vim73/src/po/Makefile      2013-02-22 17:47:53.395264524 +0200
+@@ -18,10 +18,8 @@
+               it \
+               ja \
                ko \
-               ko.UTF-8 \
+-              ko.UTF-8 \
                nb \
+               nl \
 -              no \
                pl \
                pt_BR \
@@ -19,10 +22,13 @@
  
  MOFILES = \
                af.mo \
-@@ -45,7 +43,6 @@
+@@ -56,10 +54,8 @@
+               it.mo \
+               ja.mo \
                ko.mo \
-               ko.UTF-8.mo \
+-              ko.UTF-8.mo \
                nb.mo \
+               nl.mo \
 -              no.mo \
                pl.mo \
                pt_BR.mo \
@@ -37,10 +43,13 @@
                zh_TW.mo
  
  CONVERTED = \
-@@ -82,7 +78,6 @@
+@@ -90,10 +90,8 @@
+               it.ck \
+               ja.ck \
                ko.ck \
-               ko.UTF-8.ck \
+-              ko.UTF-8.ck \
                nb.ck \
+               nl.ck \
 -              no.ck \
                pl.ck \
                pt_BR.ck \