thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.1147

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
src/option.c
View File

@@ -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)