summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/autocmd.c10
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 5 deletions
diff --git a/src/autocmd.c b/src/autocmd.c
index 9a758c8a4..aa1114333 100644
--- a/src/autocmd.c
+++ b/src/autocmd.c
@@ -391,10 +391,10 @@ au_cleanup(void)
prev_ap = &(first_autopat[(int)event]);
for (ap = *prev_ap; ap != NULL; ap = *prev_ap)
{
- // loop over all commands for this pattern
- prev_ac = &(ap->cmds);
int has_cmd = FALSE;
+ // loop over all commands for this pattern
+ prev_ac = &(ap->cmds);
for (ac = *prev_ac; ac != NULL; ac = *prev_ac)
{
// remove the command if the pattern is to be deleted or when
@@ -405,17 +405,17 @@ au_cleanup(void)
vim_free(ac->cmd);
vim_free(ac);
}
- else {
+ else
+ {
has_cmd = TRUE;
prev_ac = &(ac->next);
}
}
- if (ap->pat != NULL && !has_cmd) {
+ if (ap->pat != NULL && !has_cmd)
// Pattern was not marked for deletion, but all of its
// commands were. So mark the pattern for deletion.
au_remove_pat(ap);
- }
// remove the pattern if it has been marked for deletion
if (ap->pat == NULL)
diff --git a/src/version.c b/src/version.c
index 0b86e191f..9f65ca624 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1115,
+/**/
1114,
/**/
1113,