aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-27 09:24:23 -04:00
Code Activity

patch 7.4.1913

Browse Source 
Problem:    When ":doautocmd" is used modelines are used even when no
            autocommands were executed. (Daniel Hahler)
Solution:   Skip processing modelines. (closes #854)
This commit is contained in:
Bram Moolenaar
2016-06-09 22:53:01 +02:00
parent 1cee693b31
commit 1610d05241
5 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/fileio.c
View File

@@ -5162,7 +5162,7 @@ set_rw_fname(char_u *fname, char_u *sfname)
if (*curbuf->b_p_ft == NUL)
{
if (au_has_group((char_u *)"filetypedetect"))
(void)do_doautocmd((char_u *)"filetypedetect BufRead", FALSE);
(void)do_doautocmd((char_u *)"filetypedetect BufRead", FALSE, NULL);
do_modelines(0);
}
#endif
@@ -8688,12 +8688,16 @@ do_autocmd_event(
int
do_doautocmd(
char_u *arg,
int do_msg) /* give message for no matching autocmds? */
int do_msg, /* give message for no matching autocmds? */
int *did_something)
{
char_u *fname;
int nothing_done = TRUE;
int group;
if (did_something != NULL)
did_something = FALSE;
/*
* Check for a legal group name. If not, use AUGROUP_ALL.
*/
@@ -8727,6 +8731,8 @@ do_doautocmd(
if (nothing_done && do_msg)
MSG(_("No matching autocommands"));
if (did_something != NULL)
*did_something = !nothing_done;
#ifdef FEAT_EVAL
return aborting() ? FAIL : OK;
@@ -8746,6 +8752,7 @@ ex_doautoall(exarg_T *eap)
buf_T *buf;
char_u *arg = eap->arg;
int call_do_modelines = check_nomodeline(&arg);
int did_aucmd;
/*
* This is a bit tricky: For some commands curwin->w_buffer needs to be
@@ -8762,9 +8769,9 @@ ex_doautoall(exarg_T *eap)
aucmd_prepbuf(&aco, buf);
/* execute the autocommands for this buffer */
retval = do_doautocmd(arg, FALSE);
retval = do_doautocmd(arg, FALSE, &did_aucmd);
if (call_do_modelines)
if (call_do_modelines && did_aucmd)
{
/* Execute the modeline settings, but don't set window-local
* options if we are using the current window for another