0
0
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00

patch 7.4.1147

Problem:    Conflict for "chartab". (Kazunobu Kuriyama)
Solution:   Rename the global one to something less obvious.  Move it into
            src/chartab.c.
This commit is contained in:
Bram Moolenaar
2016-01-20 22:48:02 +01:00
parent a7c3795a2e
commit 88e8f9f144
8 changed files with 48 additions and 51 deletions

View File

@@ -1582,8 +1582,8 @@ init_locale()
/* 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)
{