diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ex_cmds.c | 5 | ||||
| -rw-r--r-- | src/option.c | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 18 insertions, 5 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 59531bea0..adf1e3bd2 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -6832,8 +6832,9 @@ fix_help_buffer(void) char_u *rt; int mustfree; - /* set filetype to "help". */ - set_option_value((char_u *)"ft", 0L, (char_u *)"help", OPT_LOCAL); + /* Set filetype to "help" if still needed. */ + if (STRCMP(curbuf->b_p_ft, "help") != 0) + set_option_value((char_u *)"ft", 0L, (char_u *)"help", OPT_LOCAL); #ifdef FEAT_SYN_HL if (!syntax_present(curwin)) diff --git a/src/option.c b/src/option.c index 2a92bc5ae..154c28b5a 100644 --- a/src/option.c +++ b/src/option.c @@ -6009,6 +6009,9 @@ did_set_string_option( /* set when changing an option that only requires a redraw in the GUI */ int redraw_gui_only = FALSE; #endif +#ifdef FEAT_AUTOCMD + int ft_changed = FALSE; +#endif /* Get the global option to compare with, otherwise we would have to check * two values for all local options. */ @@ -7418,6 +7421,8 @@ did_set_string_option( { if (!valid_filetype(*varp)) errmsg = e_invarg; + else + ft_changed = STRCMP(oldval, *varp) != 0; } #endif @@ -7531,10 +7536,15 @@ did_set_string_option( # endif else if (varp == &(curbuf->b_p_ft)) { - /* 'filetype' is set, trigger the FileType autocommand */ - did_filetype = TRUE; - apply_autocmds(EVENT_FILETYPE, curbuf->b_p_ft, + /* 'filetype' is set, trigger the FileType autocommand. + * Skip this when called from a modeline and the filetype was + * already set to this value. */ + if (!(opt_flags & OPT_MODELINE) || ft_changed) + { + did_filetype = TRUE; + apply_autocmds(EVENT_FILETYPE, curbuf->b_p_ft, curbuf->b_fname, TRUE, curbuf); + } } #endif #ifdef FEAT_SPELL diff --git a/src/version.c b/src/version.c index b221ce259..47e1da5ec 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 649, +/**/ 648, /**/ 647, |