vim-patch:7.4.1147 (#5005)

Problem:    Conflict for "chartab". (Kazunobu Kuriyama)
Solution:   Rename the global one to something less obvious.  Move it into
            src/chartab.c.

88e8f9f144
This commit is contained in:
prollings
2016-07-11 07:05:06 +10:00
committed by Justin M. Keyes
parent 29060a592c
commit dcbd1c7b13
8 changed files with 51 additions and 63 deletions

View File

@@ -670,8 +670,8 @@ static void init_locale(void)
{
char_u *p;
/* 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 = (char_u *)vim_getenv("VIMRUNTIME");
if (p != NULL && *p != NUL) {
vim_snprintf((char *)NameBuff, MAXPATHL, "%s/lang", p);