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/option.c | |
| parent | a7c3795a2e65233ba2d187d680acc83bf6bf4ef5 (diff) | |
| download | vim-git-88e8f9f14434a7cd538d0c159dc432bea869a5bd.tar.gz | |
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/option.c')
| -rw-r--r-- | src/option.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/option.c b/src/option.c index cd7064c4f..41d6cebd9 100644 --- a/src/option.c +++ b/src/option.c @@ -5934,9 +5934,9 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf, #endif /* - * 'isident', 'iskeyword', 'isprint or 'isfname' option: refill chartab[] + * 'isident', 'iskeyword', 'isprint or 'isfname' option: refill g_chartab[] * If the new option is invalid, use old value. 'lisp' option: refill - * chartab[] for '-' char + * g_chartab[] for '-' char */ else if ( varp == &p_isi || varp == &(curbuf->b_p_isk) |