patch 9.0.2065: EXPAND flag set for filetype option

Problem:  EXPAND flag set for filetype option
Solution: Remove P_EXPAND flag from the 'filetype' option

Remove P_EXPAND flag from the 'filetype' option

Problem:  P_EXPAND flag is erroneously set for 'filetype' option
Solution: Remove the P_EXPAND flag

This flag is used by string options that accept file path values.  See
:help set_env.

This appears to have been included in d5e8c92 and resulted from an
incorrect implementation of 'filetype' completion.

See #12900 for a small discussion.

related: #12900
closes: #13416

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Doug Kearns <dougkearns@gmail.com>

diff --git a/src/optiondefs.h b/src/optiondefs.h
index d5887e1d41edcf3b700279ecb02fd48059504ad2..10f2aff131170bb6fac130f28182058eaf2b9098 100644 (file)
--- 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 7651bcc46fe09ce70dc1f937c962935d84c835ec..9198a788b19a9324d20d62204bbc2de46f8cb233 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2065,
 /**/
     2064,
 /**/