Mercurial > vim

comparison src/globals.h @ 7697:f04e2b6feea2 v7.4.1147

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
7696:02d9590a8309 7697:f04e2b6feea2
1010 EXTERN int vgetc_im_active; /* Input Method was active for last 1010 EXTERN int vgetc_im_active; /* Input Method was active for last
1011 character obtained from vgetc() */ 1011 character obtained from vgetc() */
1012 #endif 1012 #endif
1013 EXTERN int maptick INIT(= 0); /* tick for each non-mapped char */ 1013 EXTERN int maptick INIT(= 0); /* tick for each non-mapped char */
1014 1014
1015 EXTERN char_u chartab[256]; /* table used in charset.c; See
1016 init_chartab() for explanation */
1017
1018 EXTERN int must_redraw INIT(= 0); /* type of redraw necessary */ 1015 EXTERN int must_redraw INIT(= 0); /* type of redraw necessary */
1019 EXTERN int skip_redraw INIT(= FALSE); /* skip redraw once */ 1016 EXTERN int skip_redraw INIT(= FALSE); /* skip redraw once */
1020 EXTERN int do_redraw INIT(= FALSE); /* extra redraw once */ 1017 EXTERN int do_redraw INIT(= FALSE); /* extra redraw once */
1021 1018
1022 EXTERN int need_highlight_changed INIT(= TRUE); 1019 EXTERN int need_highlight_changed INIT(= TRUE);