diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-02-13 17:06:33 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-02-14 15:20:32 -0500 |
| commit | da6299445a0fd52be5af2d7ea9ee539f12c20a73 (patch) | |
| tree | 2935a0f08209e9cc1fad74a6bd921c21fcdb5de2 /src | |
| parent | 9c2c24ec484ececc1869dafa973566f685418757 (diff) | |
| download | rneovim-da6299445a0fd52be5af2d7ea9ee539f12c20a73.tar.gz rneovim-da6299445a0fd52be5af2d7ea9ee539f12c20a73.tar.bz2 rneovim-da6299445a0fd52be5af2d7ea9ee539f12c20a73.zip | |
ex_docmd: rename force_enable_filetype().
It is no longer forcing anything.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_docmd.c | 2 | ||||
| -rw-r--r-- | src/nvim/main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 7655659107..f4e2667c1f 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -9301,7 +9301,7 @@ static void ex_filetype(exarg_T *eap) /// Do ":filetype plugin indent on" if user did not already do some /// permutation thereof. -void force_enable_filetype(void) +void maybe_enable_filetype(void) { if (!filetype_detect && !filetype_plugin && !filetype_indent) { source_runtime((char_u *)FILETYPE_FILE, true); diff --git a/src/nvim/main.c b/src/nvim/main.c index 6f5d40645a..a5515a30f1 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -335,7 +335,7 @@ int main(int argc, char **argv) // If using the runtime (-u is not NONE), enable syntax & filetype plugins. if (params.use_vimrc != NULL && strcmp(params.use_vimrc, "NONE") != 0) { // Do ":filetype plugin indent on". - force_enable_filetype(); + maybe_enable_filetype(); // Enable syntax (sources syntax/syntax.vim, which calls `:filetype on`). syn_cmd("syntax"); } |