diff options
author | Hinidu <hinidu@gmail.com> | 2014-04-12 00:37:27 +0300 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2014-05-28 13:08:54 -0400 |
commit | ef5d9ccefedec12b8628d204a13506e86ddb469c (patch) | |
tree | be60fb25449ed08942560f66d902709768da46b4 | |
parent | bf87a83058348694eadde290a1cc1bd478735ca0 (diff) | |
download | rneovim-ef5d9ccefedec12b8628d204a13506e86ddb469c.tar.gz rneovim-ef5d9ccefedec12b8628d204a13506e86ddb469c.tar.bz2 rneovim-ef5d9ccefedec12b8628d204a13506e86ddb469c.zip |
Remove FEAT_STL_OPT
'statusline', 'rulerformat' and special format of 'titlestring' and
'iconstring' options
-rw-r--r-- | config/config.h.in | 1 | ||||
-rw-r--r-- | src/nvim/syntax.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/config/config.h.in b/config/config.h.in index c9e52ff0c4..5e2bd0b6dc 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -140,7 +140,6 @@ #define FEAT_SEARCH_EXTRA #define FEAT_SMARTINDENT #define FEAT_SPELL -#define FEAT_STL_OPT #define FEAT_SYN_HL #define FEAT_TAG_BINS #define FEAT_TAG_OLDSTATIC diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c index 746fbac0e8..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) |