diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-05-28 13:09:50 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-05-28 13:09:59 -0400 |
| commit | 3972f6cde741a03eb04a413f61983f2d768127c2 (patch) | |
| tree | 42bedb0a0915fd82e809c6c23b812518ebd872ac /src/nvim/syntax.c | |
| parent | 3dddceedceebb73b93d399f2c56b0f1b5394c645 (diff) | |
| parent | 6fc28397950f367f4b9e5b56b9d135dde2410e76 (diff) | |
| download | rneovim-3972f6cde741a03eb04a413f61983f2d768127c2.tar.gz rneovim-3972f6cde741a03eb04a413f61983f2d768127c2.tar.bz2 rneovim-3972f6cde741a03eb04a413f61983f2d768127c2.zip | |
Merge #500 'Remove/simplify #ifdefs on default features'
Diffstat (limited to 'src/nvim/syntax.c')
| -rw-r--r-- | src/nvim/syntax.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c index ccc6752793..7d39a61b69 100644 --- a/src/nvim/syntax.c +++ b/src/nvim/syntax.c @@ -7522,7 +7522,7 @@ int syn_get_final_id(int hl_id) /* * Translate the 'highlight' option into attributes in highlight_attr[] and - * set up the user highlights User1..9. If FEAT_STL_OPT is in use, a set of + * set up the user highlights User1..9. A set of * corresponding highlights to use on top of HLF_SNC is computed. * Called only when the 'highlight' option has been changed and upon first * screen redraw after any :highlight command. @@ -7611,7 +7611,7 @@ int highlight_changed(void) return FAIL; attr = syn_id2attr(id); p = end - 1; -#if defined(FEAT_STL_OPT) && defined(USER_HIGHLIGHT) +#ifdef USER_HIGHLIGHT if (hlf == (int)HLF_SNC) id_SNC = syn_get_final_id(id); else if (hlf == (int)HLF_S) @@ -7756,8 +7756,6 @@ static void highlight_list_two(int cnt, int attr) } -#if defined(FEAT_CMDL_COMPL) || (defined(FEAT_SYN_HL) && defined(FEAT_EVAL)) \ - || defined(FEAT_SIGNS) || defined(PROTO) /* * Function given to ExpandGeneric() to obtain the list of group names. * Also used for synIDattr() function. @@ -7779,7 +7777,6 @@ char_u *get_highlight_name(expand_T *xp, int idx) return NULL; return HL_TABLE()[idx].sg_name; } -#endif /************************************** |