aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.1805: au_did_filetype is declared twice

Browse Source 
Problem:    Au_did_filetype is declared twice.
Solution:   Remove it from autocmd.c. (closes #4767)
This commit is contained in:
Bram Moolenaar 2019-08-03 23:08:14 +02:00
parent 3c8ee62974
commit 6cd57d4466
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/autocmd.c
View File

@ -239,16 +239,6 @@ static garray_T augroups = {0, 0, sizeof(char_u *), 10, NULL};
/* use get_deleted_augroup() to get this */ /* use get_deleted_augroup() to get this */
static char_u *deleted_augroup = NULL; static char_u *deleted_augroup = NULL;
/*
* Set by the apply_autocmds_group function if the given event is equal to
* EVENT_FILETYPE. Used by the readfile function in order to determine if
* EVENT_BUFREADPOST triggered the EVENT_FILETYPE.
*
* Relying on this value requires one to reset it prior calling
* apply_autocmds_group.
*/
int au_did_filetype INIT(= FALSE);
/* /*
* The ID of the current group. Group 0 is the default one. * The ID of the current group. Group 0 is the default one.
*/ */

9
src/globals.h
View File

@ -424,11 +424,18 @@ EXTERN int autocmd_no_leave INIT(= FALSE); // *Leave autocmds disabled
EXTERN int modified_was_set; // did ":set modified" EXTERN int modified_was_set; // did ":set modified"
EXTERN int did_filetype INIT(= FALSE); // FileType event found EXTERN int did_filetype INIT(= FALSE); // FileType event found
EXTERN int au_did_filetype INIT(= FALSE);
EXTERN int keep_filetype INIT(= FALSE); // value for did_filetype when EXTERN int keep_filetype INIT(= FALSE); // value for did_filetype when
// starting to execute // starting to execute
// autocommands // autocommands
// Set by the apply_autocmds_group function if the given event is equal to
// EVENT_FILETYPE. Used by the readfile function in order to determine if
// EVENT_BUFREADPOST triggered the EVENT_FILETYPE.
//
// Relying on this value requires one to reset it prior calling
// apply_autocmds_group.
EXTERN int au_did_filetype INIT(= FALSE);
// When deleting the current buffer, another one must be loaded. If we know // When deleting the current buffer, another one must be loaded. If we know
// which one is preferred, au_new_curbuf is set to it // which one is preferred, au_new_curbuf is set to it
EXTERN bufref_T au_new_curbuf INIT(= {NULL COMMA 0 COMMA 0}); EXTERN bufref_T au_new_curbuf INIT(= {NULL COMMA 0 COMMA 0});

2
src/version.c
View File

@ -773,6 +773,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1805,
/**/ /**/
1804, 1804,
/**/ /**/