summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/optiondefs.h2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/optiondefs.h b/src/optiondefs.h
index d5887e1d41..10f2aff131 100644
--- a/src/optiondefs.h
+++ b/src/optiondefs.h
@@ -943,7 +943,7 @@ static struct vimoption options[] =
(char_u *)FALSE,
#endif
(char_u *)0L} SCTX_INIT},
- {"filetype", "ft", P_STRING|P_EXPAND|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME,
+ {"filetype", "ft", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME,
(char_u *)&p_ft, PV_FT,
did_set_filetype_or_syntax, NULL,
{(char_u *)"", (char_u *)0L}
diff --git a/src/version.c b/src/version.c
index 7651bcc46f..9198a788b1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2065,
+/**/
2064,
/**/
2063,