neovim

commit af2932e2dca375d5c564b6aaac4047aa5422fc9e
parent e7a03dd4e8792d49c4c34fcc8a5bd981a0310208
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Tue, 30 Sep 2025 08:26:40 +0800

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>
Diffstat:
M
runtime/doc/options.txt
 | 
2
+-
M
runtime/doc/vimfn.txt
 | 
3
+++
M
runtime/lua/vim/_meta/options.lua
 | 
2
+-
M
runtime/lua/vim/_meta/vimfn.lua
 | 
3
+++
M
src/nvim/eval.lua
 | 
3
+++
M
src/nvim/options.lua
 | 
2
+-

6 files changed, 12 insertions(+), 3 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.