patch 8.1.1805: au_did_filetype is declared twice

Problem:    Au_did_filetype is declared twice.
Solution:   Remove it from autocmd.c. (closes #4767)

diff --git a/src/autocmd.c b/src/autocmd.c
index be8e72d2efe6dd077c123e846293e8f3e7dd5656..19b5deb71096b57b3f22c61f50ab9a696db9d464 100644 (file)
--- a/src/autocmd.c
+++ b/src/autocmd.c
@@ -239,16 +239,6 @@ static garray_T augroups = {0, 0, sizeof(char_u *), 10, NULL};
 /* use get_deleted_augroup() to get this */
 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.
  */

diff --git a/src/globals.h b/src/globals.h
index 6faee3bb29dc4424d26f81761a57a1f86d4aef27..92b28030ff8a3ef3c7cb437a6a817c30161357ee 100644 (file)
--- 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 d249d859af54502c65000ad0957ae47c88f66944..e2ebd89d16ad4c972c37f105d2f9f589f87bdc8f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -773,6 +773,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1805,
 /**/
     1804,
 /**/