comparison src/vim.h @ 2250:1bac28a53fae vim73

Add the conceal patch from Vince Negri.
author Bram Moolenaar <bram@vim.org>
date Sat, 05 Jun 2010 23:22:07 +0200
parents 60da25e3aab7
children aafed4a4866f
comparison
equal deleted inserted replaced
2249:6d3d35ff2c2b 2250:1bac28a53fae
851 # else 851 # else
852 # define SST_MAX_ENTRIES 1000 /* maximal size for state stack array */ 852 # define SST_MAX_ENTRIES 1000 /* maximal size for state stack array */
853 # endif 853 # endif
854 # define SST_FIX_STATES 7 /* size of sst_stack[]. */ 854 # define SST_FIX_STATES 7 /* size of sst_stack[]. */
855 # define SST_DIST 16 /* normal distance between entries */ 855 # define SST_DIST 16 /* normal distance between entries */
856 # define SST_INVALID (synstate_T *)-1 /* invalid syn_state pointer */
857
858 # define HL_CONTAINED 0x01 /* not used on toplevel */
859 # define HL_TRANSP 0x02 /* has no highlighting */
860 # define HL_ONELINE 0x04 /* match within one line only */
861 # define HL_HAS_EOL 0x08 /* end pattern that matches with $ */
862 # define HL_SYNC_HERE 0x10 /* sync point after this item (syncing only) */
863 # define HL_SYNC_THERE 0x20 /* sync point at current line (syncing only) */
864 # define HL_MATCH 0x40 /* use match ID instead of item ID */
865 # define HL_SKIPNL 0x80 /* nextgroup can skip newlines */
866 # define HL_SKIPWHITE 0x100 /* nextgroup can skip white space */
867 # define HL_SKIPEMPTY 0x200 /* nextgroup can skip empty lines */
868 # define HL_KEEPEND 0x400 /* end match always kept */
869 # define HL_EXCLUDENL 0x800 /* exclude NL from match */
870 # define HL_DISPLAY 0x1000 /* only used for displaying, not syncing */
871 # define HL_FOLD 0x2000 /* define fold */
872 # define HL_EXTEND 0x4000 /* ignore a keepend */
873 # define HL_MATCHCONT 0x8000 /* match continued from previous line */
874 # define HL_TRANS_CONT 0x10000 /* transparent item without contains arg */
875 # define HL_CONCEAL 0x20000 /* can be concealed */
876 # define HL_CONCEALENDS 0x40000 /* can be concealed */
856 #endif 877 #endif
857 878
858 /* Values for 'options' argument in do_search() and searchit() */ 879 /* Values for 'options' argument in do_search() and searchit() */
859 #define SEARCH_REV 0x01 /* go in reverse of previous dir. */ 880 #define SEARCH_REV 0x01 /* go in reverse of previous dir. */
860 #define SEARCH_ECHO 0x02 /* echo the search command and handle options */ 881 #define SEARCH_ECHO 0x02 /* echo the search command and handle options */
1290 , HLF_FC /* Fold column */ 1311 , HLF_FC /* Fold column */
1291 , HLF_ADD /* Added diff line */ 1312 , HLF_ADD /* Added diff line */
1292 , HLF_CHD /* Changed diff line */ 1313 , HLF_CHD /* Changed diff line */
1293 , HLF_DED /* Deleted diff line */ 1314 , HLF_DED /* Deleted diff line */
1294 , HLF_TXD /* Text Changed in diff line */ 1315 , HLF_TXD /* Text Changed in diff line */
1316 , HLF_CONCEAL /* Concealed text */
1295 , HLF_SC /* Sign column */ 1317 , HLF_SC /* Sign column */
1296 , HLF_SPB /* SpellBad */ 1318 , HLF_SPB /* SpellBad */
1297 , HLF_SPC /* SpellCap */ 1319 , HLF_SPC /* SpellCap */
1298 , HLF_SPR /* SpellRare */ 1320 , HLF_SPR /* SpellRare */
1299 , HLF_SPL /* SpellLocal */ 1321 , HLF_SPL /* SpellLocal */
1311 1333
1312 /* The HL_FLAGS must be in the same order as the HLF_ enums! 1334 /* The HL_FLAGS must be in the same order as the HLF_ enums!
1313 * When changing this also adjust the default for 'highlight'. */ 1335 * When changing this also adjust the default for 'highlight'. */
1314 #define HL_FLAGS {'8', '@', 'd', 'e', 'h', 'i', 'l', 'm', 'M', \ 1336 #define HL_FLAGS {'8', '@', 'd', 'e', 'h', 'i', 'l', 'm', 'M', \
1315 'n', 'r', 's', 'S', 'c', 't', 'v', 'V', 'w', 'W', \ 1337 'n', 'r', 's', 'S', 'c', 't', 'v', 'V', 'w', 'W', \
1316 'f', 'F', 'A', 'C', 'D', 'T', '>', \ 1338 'f', 'F', 'A', 'C', 'D', 'T', '-', '>', \
1317 'B', 'P', 'R', 'L', \ 1339 'B', 'P', 'R', 'L', \
1318 '+', '=', 'x', 'X', '*', '#', '_', '!', '.'} 1340 '+', '=', 'x', 'X', '*', '#', '_', '!', '.'}
1319 1341
1320 /* 1342 /*
1321 * Boolean constants 1343 * Boolean constants