Commit: patch 9.0.2065: EXPAND flag set for filetype option

4 views
Skip to first unread message

Christian Brabandt

unread,
Oct 25, 2023, 3:00:11 PM10/25/23
to vim...@googlegroups.com
patch 9.0.2065: EXPAND flag set for filetype option

Commit: https://github.com/vim/vim/commit/3932072ab435eb171ab55b2a2c0185358cd0d7bf
Author: Doug Kearns <dougk...@gmail.com>
Date: Wed Oct 25 20:54:00 2023 +0200

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 <c...@256bit.org>
Co-authored-by: Doug Kearns <dougk...@gmail.com>

diff --git a/src/optiondefs.h b/src/optiondefs.h
index d5887e1d4..10f2aff13 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 7651bcc46..9198a788b 100644
--- 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,
/**/
Reply all
Reply to author
Forward
0 new messages