diff options
| author | prollings <patrickrollings@gmail.com> | 2016-07-11 07:05:06 +1000 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-07-10 17:05:06 -0400 |
| commit | dcbd1c7b13e98766754c4e75d3bb59021248217e (patch) | |
| tree | 1224f777f931c26a5ff2445d372b6fe6f86c768b /src/nvim/charset.h | |
| parent | 29060a592c4c8ca4482a44b957a7bc332aed78e2 (diff) | |
| download | rneovim-dcbd1c7b13e98766754c4e75d3bb59021248217e.tar.gz rneovim-dcbd1c7b13e98766754c4e75d3bb59021248217e.tar.bz2 rneovim-dcbd1c7b13e98766754c4e75d3bb59021248217e.zip | |
vim-patch:7.4.1147 (#5005)
Problem: Conflict for "chartab". (Kazunobu Kuriyama)
Solution: Rename the global one to something less obvious. Move it into
src/chartab.c.
https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Diffstat (limited to 'src/nvim/charset.h')
| -rw-r--r-- | src/nvim/charset.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/nvim/charset.h b/src/nvim/charset.h index 995ad123ae..78d6f2a76c 100644 --- a/src/nvim/charset.h +++ b/src/nvim/charset.h @@ -1,14 +1,6 @@ #ifndef NVIM_CHARSET_H #define NVIM_CHARSET_H -/* - * 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 */ - #ifdef INCLUDE_GENERATED_DECLARATIONS # include "charset.h.generated.h" #endif |