# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1564866906 -7200
# Node ID 83ad219cc13394ed955adf3b8c0fa49c1e97ec0a
# Parent  8724920596b002858ccb33656751237d3cf9cd22
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)

diff --git a/src/autocmd.c b/src/autocmd.c
--- 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;
diff --git a/src/globals.h b/src/globals.h
--- 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});
diff --git a/src/version.c b/src/version.c
--- 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,