From e35a7d47823b4b23e519ea5af1d5d37805a2c70e Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Tue, 27 May 2025 07:23:33 +0800 Subject: [PATCH 1/2] vim-patch:a6172f8: runtime(doc): Correct allowed characters at :help 'filetype' closes: vim/vim#17366 https://github.com/vim/vim/commit/a6172f8c5ce136d877965bf49881fc6e71ea4edf Co-authored-by: Doug Kearns --- runtime/doc/options.txt | 3 ++- runtime/lua/vim/_meta/options.lua | 3 ++- src/nvim/options.lua | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 6bf607302c..3ad2da88d1 100644 --- 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 index 90118cb4a1..3380f90ce2 100644 --- 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 index 75c6f51fae..b4392c5a69 100644 --- 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, From fbf5fbacc2068eea00cdfa4a5d88a4423c3c76cc Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Tue, 27 May 2025 07:24:37 +0800 Subject: [PATCH 2/2] vim-patch:f0c7090: runtime(doc): trailing whitespace in options.txt, delete it. https://github.com/vim/vim/commit/f0c7090a3833f1c85b242a858e7d95a34456674c Co-authored-by: Christian Brabandt --- src/nvim/options.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nvim/options.lua b/src/nvim/options.lua index b4392c5a69..fa92b1481d 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -3030,7 +3030,7 @@ 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 (and a '.' is + Only alphanumeric characters, '-' and '_' can be used (and a '.' is allowed as delimiter when combining different filetypes). ]=], full_name = 'filetype',