ex_docmd: rename force_enable_filetype().

It is no longer forcing anything.
This commit is contained in:
Justin M. Keyes
2016-02-13 17:06:33 -05:00
parent 9c2c24ec48
commit da6299445a
3 changed files with 14 additions and 13 deletions

View File

@@ -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);

View File

@@ -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");
}