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/option.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/option.c')
| -rw-r--r-- | src/nvim/option.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 81f57522b3..de53b0b1f4 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -2439,16 +2439,13 @@ did_set_string_option ( else if (varp == &curwin->w_p_briopt) { if (briopt_check(curwin) == FAIL) errmsg = e_invarg; - } - /* - * 'isident', 'iskeyword', 'isprint or 'isfname' option: refill chartab[] - * If the new option is invalid, use old value. 'lisp' option: refill - * chartab[] for '-' char - */ - else if ( varp == &p_isi + } else if (varp == &p_isi || varp == &(curbuf->b_p_isk) || varp == &p_isp || varp == &p_isf) { + // 'isident', 'iskeyword', 'isprint or 'isfname' option: refill g_chartab[] + // If the new option is invalid, use old value. 'lisp' option: refill + // g_chartab[] for '-' char if (init_chartab() == FAIL) { did_chartab = TRUE; /* need to restore it below */ errmsg = e_invarg; /* error in value */ |