diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-20 22:48:02 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-20 22:48:02 +0100 |
| commit | 88e8f9f14434a7cd538d0c159dc432bea869a5bd (patch) | |
| tree | 0cc419113941be1200c09d347f96bf76cc7acaab /src/main.c | |
| parent | a7c3795a2e65233ba2d187d680acc83bf6bf4ef5 (diff) | |
patch 7.4.1147v7.4.1147
Problem: Conflict for "chartab". (Kazunobu Kuriyama)
Solution: Rename the global one to something less obvious. Move it into
src/chartab.c.
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c index 175bbde11c..e872e3aa7d 100644 --- a/src/main.c +++ b/src/main.c @@ -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) { |