- up to 8.2.1524

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

diff --git a/vim-localedir.patch b/vim-localedir.patch
index 4e3f80676e3f1ab010d65cb2c414527ffda42c9a..5a4c8e0ab5baac22caa1d13a344cc67985227aad 100644 (file)
--- a/vim-localedir.patch
+++ b/vim-localedir.patch
@@ -1,18 +1,11 @@
---- vim72/src/main.c~  2009-04-15 01:00:47.000000000 +0300
-+++ vim72/src/main.c   2009-04-15 01:11:33.555899981 +0300
-@@ -1382,23 +1382,10 @@
- 
- # ifdef FEAT_GETTEXT
-     {
--      int     mustfree = FALSE;
--      char_u  *p;
--
- #  ifdef DYNAMIC_GETTEXT
-       /* Initialize the gettext library */
-       dyn_libintl_init(NULL);
+--- vim72/src/locale.c~        2009-04-15 01:00:47.000000000 +0300
++++ vim72/src/locale.c 2009-04-15 01:11:33.555899981 +0300
+@@ -1741,17 +1741,6 @@ init_locale(void)
+       // Initialize the gettext library
+       dyn_libintl_init();
  #  endif
--      /* expand_env() doesn't work yet, because chartab[] is not initialized
--       * yet, call vim_getenv() directly */
+-      // expand_env() doesn't work yet, because g_chartab[] is not
+-      // initialized yet, call vim_getenv() directly
 -      p = vim_getenv((char_u *)"VIMRUNTIME", &mustfree);
 -      if (p != NULL && *p != NUL)
 -      {
@@ -21,9 +14,10 @@
 -      }
 -      if (mustfree)
 -          vim_free(p);
-       textdomain(VIMPACKAGE);
+-      textdomain(VIMPACKAGE);
      }
  # endif
+ }
 --- vim72/src/misc1.c~ 2009-04-15 01:00:48.000000000 +0300
 +++ vim72/src/misc1.c  2009-04-15 01:13:00.319209732 +0300
 @@ -4215,22 +4215,6 @@
@@ -76,13 +70,14 @@
           INSTALL_DATA=$(INSTALL_DATA) FILEMOD=$(FILEMOD) install; \
        fi
        if test -d $(LANGSOURCE); then \
---- vim72/src/po/Makefile~     2008-07-24 21:52:54.000000000 +0300
-+++ vim72/src/po/Makefile      2009-04-15 11:25:53.058913958 +0300
-@@ -132,6 +132,7 @@
+--- vim73/src/po/Makefile~     2013-02-22 17:28:18.000000000 +0200
++++ vim73/src/po/Makefile      2013-02-22 17:46:40.771918175 +0200
+@@ -38,6 +38,7 @@ check: $(CHECKFILES)
  
- install: $(MOFILES)
+ install: $(MOFILES) $(MOCONVERTED)
        @$(MAKE) prefixcheck
 +      install -d $(LOCALEDIR); \
        for lang in $(LANGUAGES); do \
          dir=$(LOCALEDIR)/$$lang/; \
          if test ! -x "$$dir"; then \
+