Mercurial > vim
changeset 17616:83ad219cc133 v8.1.1805
patch 8.1.1805: au_did_filetype is declared twice
commit https://github.com/vim/vim/commit/6cd57d44669c02af9195f5601b882edd435b47e8
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Aug 3 23:08:14 2019 +0200
patch 8.1.1805: au_did_filetype is declared twice
Problem: Au_did_filetype is declared twice.
Solution: Remove it from autocmd.c. (closes https://github.com/vim/vim/issues/4767)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 03 Aug 2019 23:15:06 +0200 |
| parents | 8724920596b0 |
| children | 2a583a80c0bf |
| files | src/autocmd.c src/globals.h src/version.c |
| diffstat | 3 files changed, 10 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/autocmd.c +++ b/src/autocmd.c @@ -240,16 +240,6 @@ static garray_T augroups = {0, 0, sizeof 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;
--- a/src/globals.h +++ b/src/globals.h @@ -424,11 +424,18 @@ EXTERN int autocmd_no_leave INIT(= FALSE 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});