Mercurial > vim
comparison src/main.c @ 7613:4456fa2d22e8 v7.4.1106
commit https://github.com/vim/vim/commit/286eacd3f6631e985089176fb1dff1bcf1a1d6b5
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jan 16 18:05:50 2016 +0100
patch 7.4.1106
Problem: The nsis script can't be used from the appveyor build.
Solution: Add "ifndef" to allow for variables to be set from the command
line. Remove duplicate SetCompressor command. Support using other
gettext binaries. (Ken Takata) Update build instructions to use
libintl-8.dll.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 16 Jan 2016 18:15:05 +0100 |
parents | 1a528724f9d6 |
children | f04e2b6feea2 |
comparison
equal
deleted
inserted
replaced
7612:68c8b377f278 | 7613:4456fa2d22e8 |
---|---|
1578 int mustfree = FALSE; | 1578 int mustfree = FALSE; |
1579 char_u *p; | 1579 char_u *p; |
1580 | 1580 |
1581 # ifdef DYNAMIC_GETTEXT | 1581 # ifdef DYNAMIC_GETTEXT |
1582 /* Initialize the gettext library */ | 1582 /* Initialize the gettext library */ |
1583 dyn_libintl_init(NULL); | 1583 dyn_libintl_init(); |
1584 # endif | 1584 # endif |
1585 /* expand_env() doesn't work yet, because chartab[] is not initialized | 1585 /* expand_env() doesn't work yet, because chartab[] is not initialized |
1586 * yet, call vim_getenv() directly */ | 1586 * yet, call vim_getenv() directly */ |
1587 p = vim_getenv((char_u *)"VIMRUNTIME", &mustfree); | 1587 p = vim_getenv((char_u *)"VIMRUNTIME", &mustfree); |
1588 if (p != NULL && *p != NUL) | 1588 if (p != NULL && *p != NUL) |