summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/fileio.c8
-rw-r--r--src/structs.h6
-rw-r--r--src/version.c2
3 files changed, 9 insertions, 7 deletions
diff --git a/src/fileio.c b/src/fileio.c
index f1db98364..6665c3a1c 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -7614,16 +7614,16 @@ typedef struct AutoCmd
typedef struct AutoPat
{
- int group; /* group ID */
char_u *pat; /* pattern as typed (NULL when pattern
has been removed) */
- int patlen; /* strlen() of pat */
regprog_T *reg_prog; /* compiled regprog for pattern */
- char allow_dirs; /* Pattern may match whole path */
- char last; /* last pattern for apply_autocmds() */
AutoCmd *cmds; /* list of commands to do */
struct AutoPat *next; /* next AutoPat in AutoPat list */
+ int group; /* group ID */
+ int patlen; /* strlen() of pat */
int buflocal_nr; /* !=0 for buffer-local AutoPat */
+ char allow_dirs; /* Pattern may match whole path */
+ char last; /* last pattern for apply_autocmds() */
} AutoPat;
static struct event_name
diff --git a/src/structs.h b/src/structs.h
index 4f38ad9e9..bfe1919b6 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1180,12 +1180,12 @@ typedef struct dictitem_S dictitem_T;
*/
struct dictvar_S
{
+ char dv_lock; /* zero, VAR_LOCKED, VAR_FIXED */
+ char dv_scope; /* zero, VAR_SCOPE, VAR_DEF_SCOPE */
int dv_refcount; /* reference count */
- hashtab_T dv_hashtab; /* hashtab that refers to the items */
int dv_copyID; /* ID used by deepcopy() */
+ hashtab_T dv_hashtab; /* hashtab that refers to the items */
dict_T *dv_copydict; /* copied dict used by deepcopy() */
- char dv_lock; /* zero, VAR_LOCKED, VAR_FIXED */
- char dv_scope; /* zero, VAR_SCOPE, VAR_DEF_SCOPE */
dict_T *dv_used_next; /* next dict in used dicts list */
dict_T *dv_used_prev; /* previous dict in used dicts list */
};
diff --git a/src/version.c b/src/version.c
index 7ea945f78..f42c31f65 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1177,
+/**/
1176,
/**/
1175,