aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/main.c
diff options
context:
space:
mode:
authorFelipe Morales <hel.sheep@gmail.com>2016-02-12 18:02:42 +0100
committerJustin M. Keyes <justinkz@gmail.com>2016-02-14 15:20:32 -0500
commit9c2c24ec484ececc1869dafa973566f685418757 (patch)
tree42468003a7933d32c589962ebd68748bce2f8f59 /src/nvim/main.c
parentcae090416046bb64326eff06847d4c9bd5d3d5f2 (diff)
downloadrneovim-9c2c24ec484ececc1869dafa973566f685418757.tar.gz
rneovim-9c2c24ec484ececc1869dafa973566f685418757.tar.bz2
rneovim-9c2c24ec484ececc1869dafa973566f685418757.zip
syntax: don't override user settings
Diffstat (limited to 'src/nvim/main.c')
-rw-r--r--src/nvim/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c
index b1f5a6ccad..6f5d40645a 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -332,12 +332,12 @@ int main(int argc, char **argv)
/* Source startup scripts. */
source_startup_scripts(&params);
- // If using the runtime (-u is not NONE), enable syntax and filetype plugins
+ // If using the runtime (-u is not NONE), enable syntax & filetype plugins.
if (params.use_vimrc != NULL && strcmp(params.use_vimrc, "NONE") != 0) {
- // Do this before syntax/syntax.vim (which calls `:filetype on`).
+ // Do ":filetype plugin indent on".
force_enable_filetype();
- // Enable syntax highlighting.
- syn_cmd("syntax"); // sources syntax/syntax.vim
+ // Enable syntax (sources syntax/syntax.vim, which calls `:filetype on`).
+ syn_cmd("syntax");
}
/*