Mercurial > vim

comparison src/syntax.c @ 13380:69517d67421f v8.0.1564

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1564: too many #ifdefs commit https://github.com/vim/vim/commit/f2bd8ef2b4507d02c6043affff8f7e85e3414d5f Author: Bram Moolenaar <Bram@vim.org> Date: Sun Mar 4 18:08:14 2018 +0100 patch 8.0.1564: too many #ifdefs Problem: Too many #ifdefs. Solution: Graduate the +autocmd feature. Takes away 450 #ifdefs and increases code size of tiny Vim by only 40 Kbyte.
author Christian Brabandt <cb@256bit.org>
date Sun, 04 Mar 2018 18:15:08 +0100
parents 33f514c94943
children 459c4b29b6c1
comparison
equal deleted inserted replaced
13379:0f9dd1b43244 13380:69517d67421f
6418 /* save value of b:current_syntax */ 6418 /* save value of b:current_syntax */
6419 old_value = get_var_value((char_u *)"b:current_syntax"); 6419 old_value = get_var_value((char_u *)"b:current_syntax");
6420 if (old_value != NULL) 6420 if (old_value != NULL)
6421 old_value = vim_strsave(old_value); 6421 old_value = vim_strsave(old_value);
6422 6422
6423 #ifdef FEAT_AUTOCMD
6424 /* Apply the "syntax" autocommand event, this finds and loads the syntax 6423 /* Apply the "syntax" autocommand event, this finds and loads the syntax
6425 * file. */ 6424 * file. */
6426 apply_autocmds(EVENT_SYNTAX, eap->arg, curbuf->b_fname, TRUE, curbuf); 6425 apply_autocmds(EVENT_SYNTAX, eap->arg, curbuf->b_fname, TRUE, curbuf);
6427 #endif
6428 6426
6429 /* move value of b:current_syntax to w:current_syntax */ 6427 /* move value of b:current_syntax to w:current_syntax */
6430 new_value = get_var_value((char_u *)"b:current_syntax"); 6428 new_value = get_var_value((char_u *)"b:current_syntax");
6431 if (new_value != NULL) 6429 if (new_value != NULL)
6432 set_internal_string_var((char_u *)"w:current_syntax", new_value); 6430 set_internal_string_var((char_u *)"w:current_syntax", new_value);
6993 #endif 6991 #endif
6994 #ifdef FEAT_CONCEAL 6992 #ifdef FEAT_CONCEAL
6995 CENT("Conceal ctermbg=DarkGrey ctermfg=LightGrey", 6993 CENT("Conceal ctermbg=DarkGrey ctermfg=LightGrey",
6996 "Conceal ctermbg=DarkGrey ctermfg=LightGrey guibg=DarkGrey guifg=LightGrey"), 6994 "Conceal ctermbg=DarkGrey ctermfg=LightGrey guibg=DarkGrey guifg=LightGrey"),
6997 #endif 6995 #endif
6998 #ifdef FEAT_AUTOCMD
6999 CENT("MatchParen term=reverse ctermbg=Cyan", 6996 CENT("MatchParen term=reverse ctermbg=Cyan",
7000 "MatchParen term=reverse ctermbg=Cyan guibg=Cyan"), 6997 "MatchParen term=reverse ctermbg=Cyan guibg=Cyan"),
7001 #endif
7002 #ifdef FEAT_GUI 6998 #ifdef FEAT_GUI
7003 "Normal gui=NONE", 6999 "Normal gui=NONE",
7004 #endif 7000 #endif
7005 #ifdef FEAT_TERMINAL 7001 #ifdef FEAT_TERMINAL
7006 CENT("StatusLineTerm term=reverse,bold cterm=bold ctermfg=White ctermbg=DarkGreen", 7002 CENT("StatusLineTerm term=reverse,bold cterm=bold ctermfg=White ctermbg=DarkGreen",
7087 CENT("CursorLine term=underline cterm=underline", 7083 CENT("CursorLine term=underline cterm=underline",
7088 "CursorLine term=underline cterm=underline guibg=Grey40"), 7084 "CursorLine term=underline cterm=underline guibg=Grey40"),
7089 CENT("ColorColumn term=reverse ctermbg=DarkRed", 7085 CENT("ColorColumn term=reverse ctermbg=DarkRed",
7090 "ColorColumn term=reverse ctermbg=DarkRed guibg=DarkRed"), 7086 "ColorColumn term=reverse ctermbg=DarkRed guibg=DarkRed"),
7091 #endif 7087 #endif
7092 #ifdef FEAT_AUTOCMD
7093 CENT("MatchParen term=reverse ctermbg=DarkCyan", 7088 CENT("MatchParen term=reverse ctermbg=DarkCyan",
7094 "MatchParen term=reverse ctermbg=DarkCyan guibg=DarkCyan"), 7089 "MatchParen term=reverse ctermbg=DarkCyan guibg=DarkCyan"),
7095 #endif
7096 #ifdef FEAT_CONCEAL 7090 #ifdef FEAT_CONCEAL
7097 CENT("Conceal ctermbg=DarkGrey ctermfg=LightGrey", 7091 CENT("Conceal ctermbg=DarkGrey ctermfg=LightGrey",
7098 "Conceal ctermbg=DarkGrey ctermfg=LightGrey guibg=DarkGrey guifg=LightGrey"), 7092 "Conceal ctermbg=DarkGrey ctermfg=LightGrey guibg=DarkGrey guifg=LightGrey"),
7099 #endif 7093 #endif
7100 #ifdef FEAT_GUI 7094 #ifdef FEAT_GUI
7231 if (buf != NULL) 7225 if (buf != NULL)
7232 { 7226 {
7233 sprintf((char *)buf, "colors/%s.vim", name); 7227 sprintf((char *)buf, "colors/%s.vim", name);
7234 retval = source_runtime(buf, DIP_START + DIP_OPT); 7228 retval = source_runtime(buf, DIP_START + DIP_OPT);
7235 vim_free(buf); 7229 vim_free(buf);
7236 #ifdef FEAT_AUTOCMD
7237 apply_autocmds(EVENT_COLORSCHEME, name, curbuf->b_fname, FALSE, curbuf); 7230 apply_autocmds(EVENT_COLORSCHEME, name, curbuf->b_fname, FALSE, curbuf);
7238 #endif
7239 } 7231 }
7240 recursive = FALSE; 7232 recursive = FALSE;
7241 7233
7242 return retval; 7234 return retval;
7243 } 7235 }