mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-17 00:38:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

syntax: avoid extra global macro

Browse Source
This commit is contained in:
Justin M. Keyes
2015-11-30 02:09:37 -05:00
parent 50e129f5a7
commit cae0904160
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/globals.h
View File

@@ -92,10 +92,6 @@
# define SYNTAX_FNAME "$VIMRUNTIME" _PATHSEPSTR "syntax" _PATHSEPSTR "%s.vim" # define SYNTAX_FNAME "$VIMRUNTIME" _PATHSEPSTR "syntax" _PATHSEPSTR "%s.vim"
#endif #endif
#ifndef SYNTAX_FILE
# define SYNTAX_FILE "$VIMRUNTIME" _PATHSEPSTR "syntax" _PATHSEPSTR "syntax.vim"
#endif
#ifndef EXRC_FILE #ifndef EXRC_FILE
# define EXRC_FILE ".exrc" # define EXRC_FILE ".exrc"
#endif #endif

2
src/nvim/main.c
View File

@@ -337,7 +337,7 @@ int main(int argc, char **argv)
// Do this before syntax/syntax.vim (which calls `:filetype on`). // Do this before syntax/syntax.vim (which calls `:filetype on`).
force_enable_filetype(); force_enable_filetype();
// Enable syntax highlighting. // Enable syntax highlighting.
do_source((char_u *)SYNTAX_FILE, false, DOSO_NONE); syn_cmd("syntax"); // sources syntax/syntax.vim
} }
/* /*

14
src/nvim/syntax.c
View File

@@ -3286,15 +3286,21 @@ static void syn_cmd_off(exarg_T *eap, int syncing)
} }
static void syn_cmd_onoff(exarg_T *eap, char *name) static void syn_cmd_onoff(exarg_T *eap, char *name)
FUNC_ATTR_NONNULL_ALL
{ {
char buf[100];
eap->nextcmd = check_nextcmd(eap->arg); eap->nextcmd = check_nextcmd(eap->arg);
if (!eap->skip) { if (!eap->skip) {
strcpy(buf, "so "); syn_cmd(name);
}
}
void syn_cmd(char *name)
FUNC_ATTR_NONNULL_ALL
{
char buf[100];
strncpy(buf, "so ", 3);
vim_snprintf(buf + 3, sizeof(buf) - 3, SYNTAX_FNAME, name); vim_snprintf(buf + 3, sizeof(buf) - 3, SYNTAX_FNAME, name);
do_cmdline_cmd(buf); do_cmdline_cmd(buf);
}
} }
/* /*