0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

Add the conceal patch from Vince Negri.

This commit is contained in:
Bram Moolenaar
2010-06-05 23:22:07 +02:00
parent 945e2dbb63
commit 860cae1cec
40 changed files with 1737 additions and 698 deletions

View File

@@ -853,6 +853,27 @@ extern char *(*dyn_libintl_textdomain)(const char *domainname);
# endif
# define SST_FIX_STATES 7 /* size of sst_stack[]. */
# define SST_DIST 16 /* normal distance between entries */
# define SST_INVALID (synstate_T *)-1 /* invalid syn_state pointer */
# 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 */
#endif
/* Values for 'options' argument in do_search() and searchit() */
@@ -1292,6 +1313,7 @@ typedef enum
, HLF_CHD /* Changed diff line */
, HLF_DED /* Deleted diff line */
, HLF_TXD /* Text Changed in diff line */
, HLF_CONCEAL /* Concealed text */
, HLF_SC /* Sign column */
, HLF_SPB /* SpellBad */
, HLF_SPC /* SpellCap */
@@ -1313,7 +1335,7 @@ typedef enum
* When changing this also adjust the default for 'highlight'. */
#define HL_FLAGS {'8', '@', 'd', 'e', 'h', 'i', 'l', 'm', 'M', \
'n', 'r', 's', 'S', 'c', 't', 'v', 'V', 'w', 'W', \
'f', 'F', 'A', 'C', 'D', 'T', '>', \
'f', 'F', 'A', 'C', 'D', 'T', '-', '>', \
'B', 'P', 'R', 'L', \
'+', '=', 'x', 'X', '*', '#', '_', '!', '.'}