diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-08-03 23:08:14 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-08-03 23:08:14 +0200 |
| commit | 6cd57d44669c02af9195f5601b882edd435b47e8 (patch) | |
| tree | 47ef797854d96173a8ba1f9403f8d5823eb91b23 | |
| parent | 3c8ee629745737aa231fdd123826ae021e398e49 (diff) | |
patch 8.1.1805: au_did_filetype is declared twicev8.1.1805
Problem: Au_did_filetype is declared twice.
Solution: Remove it from autocmd.c. (closes #4767)
| -rw-r--r-- | src/autocmd.c | 10 | ||||
| -rw-r--r-- | src/globals.h | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 10 insertions, 11 deletions
diff --git a/src/autocmd.c b/src/autocmd.c index be8e72d2ef..19b5deb710 100644 --- a/src/autocmd.c +++ b/src/autocmd.c @@ -240,16 +240,6 @@ static garray_T augroups = {0, 0, sizeof(char_u *), 10, 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. */ static int current_augroup = AUGROUP_DEFAULT; diff --git a/src/globals.h b/src/globals.h index 6faee3bb29..92b28030ff 100644 --- a/src/globals.h +++ b/src/globals.h @@ -424,11 +424,18 @@ EXTERN int autocmd_no_leave INIT(= FALSE); // *Leave autocmds disabled EXTERN int modified_was_set; // did ":set modified" 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 // starting to execute // 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 // which one is preferred, au_new_curbuf is set to it EXTERN bufref_T au_new_curbuf INIT(= {NULL COMMA 0 COMMA 0}); diff --git a/src/version.c b/src/version.c index d249d859af..e2ebd89d16 100644 --- a/src/version.c +++ b/src/version.c @@ -774,6 +774,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1805, +/**/ 1804, /**/ 1803, |