From a32df5e734460dfdf9bc85aebf5252d64fcb99f5 Mon Sep 17 00:00:00 2001 From: Brandon Coleman Date: Wed, 28 May 2014 23:00:49 -0500 Subject: move defines from vim.h buffer.h: buflist_getfile() flags buflist_new() flags buf_freeall() flags do_buffer() flags charset.h: chartab[] flags edit.h: in_cinkeys() flags change_indent() flags beginline() flags insertchar() flags nv_mousescroll() flags eval.c AUTOLOAD_CHAR eval.h: enum for vimvars[] ex_cmds.h: do_ecmd read_viminfo flags ex_cmds2.h: check_changed() flags do_source() flags ex_cmds_defs.h: BAD_* flags ex_docmd.h: VALID_PATH VALID_HEAD EXMODE_* do_cmdline() flags added include ex_getln.c *_ESC_CHARS definitions ex_getln.h: history table flags - used by add_to_history() fileio.h: readfile() flags event_T definition getchar.h: ins_typebuf() flags KEYLEN_* globals.h: NO_SCREEN NO_BUFFERS SEA_* defines current_SID flags hlf_T enum HL_FLAGS do_profiling() flags schar_T sattr_T indent.h: set_indent() flags macros.h: BINARY_FILE_IO flags mbyte.h: MB_BYTE2LEN* ENC_* memfile.h: mf_sync() flags misc1.h: open_line() flags message.h: do_dialog() flags vim_dialogyesno() flags DLG_BUTTON_* normal.h: find_ident_under_cursor() flags ops.h: do_put() flags operator ID's option.h: buf_copy_options() flags OPT_* flags os_unix.h: mch_nodetype() flags quickfix.h: skip_vimgrep_pat() flags regexp.h: vim_regcomp() flags values for reg_do_extmatch search.h: do_search() flags search_regcomp() flags findmatchlimit() flags syntax.h: HL_* flags HL_FOLD is used in buffer_defs.h but nvim compiles just fine with the defines in syntax.h tag.h: do_tag() flags find_tags() flags term.h: TBUFSZ flags MOUSE flags ui.h: jump_to_mouse() flags window.h: file_name_in_line() flags win_split() flags MIN_LINES MIN_COLUMNS Remove VimClipboard which should have been removed with PR #921. --- src/nvim/syntax.h | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) (limited to 'src/nvim/syntax.h') diff --git a/src/nvim/syntax.h b/src/nvim/syntax.h index d9301267a8..a03bd1e604 100644 --- a/src/nvim/syntax.h +++ b/src/nvim/syntax.h @@ -11,14 +11,34 @@ typedef int guicolor_T; * Terminal highlighting attribute bits. * Attributes above HL_ALL are used for syntax highlighting. */ -#define HL_NORMAL 0x00 -#define HL_INVERSE 0x01 -#define HL_BOLD 0x02 -#define HL_ITALIC 0x04 -#define HL_UNDERLINE 0x08 -#define HL_UNDERCURL 0x10 -#define HL_STANDOUT 0x20 -#define HL_ALL 0x3f +#define HL_NORMAL 0x00 +#define HL_INVERSE 0x01 +#define HL_BOLD 0x02 +#define HL_ITALIC 0x04 +#define HL_UNDERLINE 0x08 +#define HL_UNDERCURL 0x10 +#define HL_STANDOUT 0x20 +#define HL_ALL 0x3f + +#define HL_CONTAINED 0x01 /* not used on toplevel */ +#define HL_TRANSP 0x02 /* has no highlighting */ +#define HL_ONELINE 0x04 /* match within one line only */ +#define HL_HAS_EOL 0x08 /* end pattern that matches with $ */ +#define HL_SYNC_HERE 0x10 /* sync point after this item (syncing only) */ +#define HL_SYNC_THERE 0x20 /* sync point at current line (syncing only) */ +#define HL_MATCH 0x40 /* use match ID instead of item ID */ +#define HL_SKIPNL 0x80 /* nextgroup can skip newlines */ +#define HL_SKIPWHITE 0x100 /* nextgroup can skip white space */ +#define HL_SKIPEMPTY 0x200 /* nextgroup can skip empty lines */ +#define HL_KEEPEND 0x400 /* end match always kept */ +#define HL_EXCLUDENL 0x800 /* exclude NL from match */ +#define HL_DISPLAY 0x1000 /* only used for displaying, not syncing */ +#define HL_FOLD 0x2000 /* define fold */ +#define HL_EXTEND 0x4000 /* ignore a keepend */ +#define HL_MATCHCONT 0x8000 /* match continued from previous line */ +#define HL_TRANS_CONT 0x10000 /* transparent item without contains arg */ +#define HL_CONCEAL 0x20000 /* can be concealed */ +#define HL_CONCEALENDS 0x40000 /* can be concealed */ #ifdef INCLUDE_GENERATED_DECLARATIONS # include "syntax.h.generated.h" -- cgit