commit 88e8f9f14434a7cd538d0c159dc432bea869a5bd
author Bram Moolenaar <Bram@vim.org> Wed Jan 20 22:48:02 2016 +0100
committer Bram Moolenaar <Bram@vim.org> Wed Jan 20 22:48:02 2016 +0100
tree 0cc419113941be1200c09d347f96bf76cc7acaab
parent a7c3795a2e65233ba2d187d680acc83bf6bf4ef5

patch 7.4.1147
Problem:    Conflict for "chartab". (Kazunobu Kuriyama)
Solution:   Rename the global one to something less obvious.  Move it into
            src/chartab.c.

src/option.c

diff --git a/src/option.c b/src/option.c
index cd7064c..41d6ceb 100644
--- a/src/option.c
+++ b/src/option.c
@@ -5934,9 +5934,9 @@
 #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)