neovim

commit a2daa3c0c0511ec85f787e76356e853ef6359268
parent 5e64d92411737a8fe0ea44faebf986944bfea8ea
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Tue, 27 May 2025 07:46:13 +0800

Merge pull request #34193 from zeertzjq/vim-a6172f8

vim-patch: Correct allowed characters at :help 'filetype'
Diffstat:
M
runtime/doc/options.txt
 | 
3
++-
M
runtime/lua/vim/_meta/options.lua
 | 
3
++-
M
src/nvim/options.lua
 | 
3
++-

3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
@@ -2621,7 +2621,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	one dot may appear.
 	This option is not copied to another buffer, independent of the 's' or
 	'S' flag in 'cpoptions'.
-	Only alphanumeric characters, '-' and '_' can be used.
+	Only alphanumeric characters, '-' and '_' can be used (and a '.' is
+	allowed as delimiter when combining different filetypes).
 
 						*'fillchars'* *'fcs'*
 'fillchars' 'fcs'	string	(default "")
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
@@ -2313,7 +2313,8 @@ vim.go.fic = vim.go.fileignorecase
 --- one dot may appear.
 --- This option is not copied to another buffer, independent of the 's' or
 --- 'S' flag in 'cpoptions'.
---- Only alphanumeric characters, '-' and '_' can be used.
+--- Only alphanumeric characters, '-' and '_' can be used (and a '.' is
+--- allowed as delimiter when combining different filetypes).
 ---
 --- @type string
 vim.o.filetype = ""
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
@@ -3030,7 +3030,8 @@ local options = {
         one dot may appear.
         This option is not copied to another buffer, independent of the 's' or
         'S' flag in 'cpoptions'.
-        Only alphanumeric characters, '-' and '_' can be used.
+        Only alphanumeric characters, '-' and '_' can be used (and a '.' is
+        allowed as delimiter when combining different filetypes).
       ]=],
       full_name = 'filetype',
       noglob = true,