diff options
| author | prollings <patrickrollings@gmail.com> | 2016-07-11 07:05:06 +1000 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-07-10 17:05:06 -0400 |
| commit | dcbd1c7b13e98766754c4e75d3bb59021248217e (patch) | |
| tree | 1224f777f931c26a5ff2445d372b6fe6f86c768b /src/nvim/main.c | |
| parent | 29060a592c4c8ca4482a44b957a7bc332aed78e2 (diff) | |
| download | rneovim-dcbd1c7b13e98766754c4e75d3bb59021248217e.tar.gz rneovim-dcbd1c7b13e98766754c4e75d3bb59021248217e.tar.bz2 rneovim-dcbd1c7b13e98766754c4e75d3bb59021248217e.zip | |
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.
https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Diffstat (limited to 'src/nvim/main.c')
| -rw-r--r-- | src/nvim/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index 64b5de8663..e052d0d315 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -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); |