Mercurial > vim
diff src/globals.h @ 7697:f04e2b6feea2 v7.4.1147
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jan 20 22:48:02 2016 +0100
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.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 20 Jan 2016 23:00:12 +0100 |
| parents | 8fc60af6dbf5 |
| children | bce3b5ddb393 |
line wrap: on
line diff
--- a/src/globals.h +++ b/src/globals.h @@ -1012,9 +1012,6 @@ EXTERN int vgetc_im_active; /* Input Met #endif EXTERN int maptick INIT(= 0); /* tick for each non-mapped char */ -EXTERN char_u chartab[256]; /* table used in charset.c; See - init_chartab() for explanation */ - EXTERN int must_redraw INIT(= 0); /* type of redraw necessary */ EXTERN int skip_redraw INIT(= FALSE); /* skip redraw once */ EXTERN int do_redraw INIT(= FALSE); /* extra redraw once */