From af2932e2dca375d5c564b6aaac4047aa5422fc9e Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 30 Sep 2025 08:26:40 +0800
Subject: [PATCH] vim-patch:992e307: runtime(doc): update list of modifiers at
 :h expand() (#35957)

fixes: vim/vim#18435

https://github.com/vim/vim/commit/992e30774f5ec81f53d5554c42137d3c85999081

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/doc/options.txt           | 2 +-
 runtime/doc/vimfn.txt             | 3 +++
 runtime/lua/vim/_meta/options.lua | 2 +-
 runtime/lua/vim/_meta/vimfn.lua   | 3 +++
 src/nvim/eval.lua                 | 3 +++
 src/nvim/options.lua              | 2 +-
 6 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 4f35ca6c4b..d82ebb71b3 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2711,7 +2711,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	illegal byte sequence.
 	WRONG VALUES:			WHAT'S WRONG:
 		latin1,utf-8		"latin1" will always be used
-		utf-8,ucs-bom,latin1	BOM won't be recognized in an utf-8
+		utf-8,ucs-bom,latin1	BOM won't be recognized in a utf-8
 					file
 		cp1250,latin1		"cp1250" will always be used
 	If 'fileencodings' is empty, 'fileencoding' is not modified.
diff --git a/runtime/doc/vimfn.txt b/runtime/doc/vimfn.txt
index f15bc1deff..60962561e7 100644
--- a/runtime/doc/vimfn.txt
+++ b/runtime/doc/vimfn.txt
@@ -2136,6 +2136,9 @@ expand({string} [, {nosuf} [, {list}]])                               *expand()*
 			:r		Root (one extension removed)
 			:e		Extension only
 
+		More modifiers are supported, for the full list see
+		|filename-modifiers|.
+
 		Example: >vim
 			let &tags = expand("%:p:h") .. "/tags"
 <		Note that when expanding a string that starts with '%', '#' or
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index c9a590f5c7..6323d11d4c 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -2413,7 +2413,7 @@ vim.bo.fenc = vim.bo.fileencoding
 --- illegal byte sequence.
 --- WRONG VALUES:			WHAT'S WRONG:
 --- 	latin1,utf-8		"latin1" will always be used
---- 	utf-8,ucs-bom,latin1	BOM won't be recognized in an utf-8
+--- 	utf-8,ucs-bom,latin1	BOM won't be recognized in a utf-8
 --- 				file
 --- 	cp1250,latin1		"cp1250" will always be used
 --- If 'fileencodings' is empty, 'fileencoding' is not modified.
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 436da3ae3f..4302c3d689 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -1893,6 +1893,9 @@ function vim.fn.exp(expr) end
 ---   :r    Root (one extension removed)
 ---   :e    Extension only
 ---
+--- More modifiers are supported, for the full list see
+--- |filename-modifiers|.
+---
 --- Example: >vim
 ---   let &tags = expand("%:p:h") .. "/tags"
 --- <Note that when expanding a string that starts with '%', '#' or
diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua
index a34237abee..4e7c4b3da4 100644
--- a/src/nvim/eval.lua
+++ b/src/nvim/eval.lua
@@ -2442,6 +2442,9 @@ M.funcs = {
       	:r		Root (one extension removed)
       	:e		Extension only
 
+      More modifiers are supported, for the full list see
+      |filename-modifiers|.
+
       Example: >vim
       	let &tags = expand("%:p:h") .. "/tags"
       <Note that when expanding a string that starts with '%', '#' or
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 7cb74396bc..4f1d03e57e 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -3047,7 +3047,7 @@ local options = {
         illegal byte sequence.
         WRONG VALUES:			WHAT'S WRONG:
         	latin1,utf-8		"latin1" will always be used
-        	utf-8,ucs-bom,latin1	BOM won't be recognized in an utf-8
+        	utf-8,ucs-bom,latin1	BOM won't be recognized in a utf-8
         				file
         	cp1250,latin1		"cp1250" will always be used
         If 'fileencodings' is empty, 'fileencoding' is not modified.