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 160a5e50373906c4c89c16c949a163f06f195101..b72a8bc84219e119761c47a8737136c25f6e1640 100644 (file)
--- a/vim-locales.patch
+++ b/vim-locales.patch
@@ -1,11 +1,13 @@
---- 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,7 @@
+--- 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 \
+               nb \
+               nl \
 -              no \
-+              nb \
                pl \
                pt_BR \
                ru \
@@ -20,12 +22,14 @@
  
  MOFILES = \
                af.mo \
-@@ -45,7 +43,7 @@
+@@ -56,10 +54,8 @@
                it.mo \
                ja.mo \
                ko.mo \
+-              ko.UTF-8.mo \
+               nb.mo \
+               nl.mo \
 -              no.mo \
-+              nb.mo \
                pl.mo \
                pt_BR.mo \
                ru.mo \
@@ -39,12 +43,27 @@
                zh_TW.mo
  
  CONVERTED = \
-@@ -82,7 +78,7 @@
+@@ -90,10 +90,8 @@
                it.ck \
                ja.ck \
                ko.ck \
+-              ko.UTF-8.ck \
+               nb.ck \
+               nl.ck \
 -              no.ck \
-+              nb.ck \
                pl.ck \
                pt_BR.ck \
                ru.ck \
+@@ -160,12 +160,6 @@
+ 
+ converted: $(CONVERTED)
+ 
+-# Norwegian/Bokmal: "nb" is an alias for "no".
+-# Copying the file is not efficient, but I don't know of another way to make
+-# this work.
+-nb.po: no.po
+-      cp no.po nb.po
+-
+ # Convert ja.po to create ja.sjis.po.  Requires doubling backslashes in the
+ # second byte.  Don't depend on sjiscorr, it should only be compiled when
+ # ja.sjis.po is outdated.