0
0
mirror of https://github.com/vim/vim.git synced 2025-10-04 05:25:06 -04:00

updated for version 7.3.442

Problem:    Still read modelines for ":doautocmd".
Solution:   Move check for <nomodeline> to separate function.
This commit is contained in:
Bram Moolenaar
2012-02-12 20:14:01 +01:00
parent bbc98db7c4
commit 60542ac9fd
5 changed files with 36 additions and 16 deletions

View File

@@ -4955,7 +4955,7 @@ ex_abclear(eap)
map_clear(eap->cmd, eap->arg, TRUE, TRUE);
}
#ifdef FEAT_AUTOCMD
#if defined(FEAT_AUTOCMD) || defined(PROTO)
static void
ex_autocmd(eap)
exarg_T *eap;
@@ -4982,8 +4982,12 @@ ex_autocmd(eap)
ex_doautocmd(eap)
exarg_T *eap;
{
(void)do_doautocmd(eap->arg, TRUE);
do_modelines(0);
char_u *arg = eap->arg;
int call_do_modelines = check_nomodeline(&arg);
(void)do_doautocmd(arg, TRUE);
if (call_do_modelines) /* Only when there is no <nomodeline>. */
do_modelines(0);
}
#endif