Mercurial > vim
diff src/vim.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 | b44fc33ef92a |
| children | bce3b5ddb393 |
line wrap: on
line diff
--- a/src/vim.h +++ b/src/vim.h @@ -1111,14 +1111,6 @@ extern char *(*dyn_libintl_textdomain)(c #define HIST_COUNT 5 /* number of history tables */ /* - * Flags for chartab[]. - */ -#define CT_CELL_MASK 0x07 /* mask: nr of display cells (1, 2 or 4) */ -#define CT_PRINT_CHAR 0x10 /* flag: set for printable chars */ -#define CT_ID_CHAR 0x20 /* flag: set for ID chars */ -#define CT_FNAME_CHAR 0x40 /* flag: set for file name chars */ - -/* * Values for do_tag(). */ #define DT_TAG 1 /* jump to newer position or same tag again */