Merge remote-tracking branch 'upstream/master' into mix_20240309

1 files changed, 29 insertions, 15 deletions

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 4c726f86d2..ada3b7103c 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -269,16 +269,16 @@ assert_equal({expected}, {actual} [, {msg}])                    *assert_equal()*
                 Return: ~
                   (`0|1`)
 
-assert_equalfile({fname-one}, {fname-two})                  *assert_equalfile()*
-		When the files {fname-one} and {fname-two} do not contain
+assert_equalfile({fname_one}, {fname_two})                  *assert_equalfile()*
+		When the files {fname_one} and {fname_two} do not contain
 		exactly the same text an error message is added to |v:errors|.
 		Also see |assert-return|.
-		When {fname-one} or {fname-two} does not exist the error will
+		When {fname_one} or {fname_two} does not exist the error will
 		mention that.
 
                 Parameters: ~
-                  • {fname-one} (`string`)
-                  • {fname-two} (`string`)
+                  • {fname_one} (`string`)
+                  • {fname_two} (`string`)
 
                 Return: ~
                   (`0|1`)
@@ -936,7 +936,7 @@ charclass({string})                                                *charclass()*
 		The character class is one of:
 			0	blank
 			1	punctuation
-			2	word character
+			2	word character (depends on 'iskeyword')
 			3	emoji
 			other	specific Unicode class
 		The class is used in patterns and word motions.
@@ -959,7 +959,7 @@ charcol({expr} [, {winid}])                                          *charcol()*
 <
 
                 Parameters: ~
-                  • {expr} (`string|integer[]`)
+                  • {expr} (`string|any[]`)
                   • {winid} (`integer?`)
 
                 Return: ~
@@ -1100,7 +1100,7 @@ col({expr} [, {winid}])                                                  *col()*
 <
 
                 Parameters: ~
-                  • {expr} (`string|integer[]`)
+                  • {expr} (`string|any[]`)
                   • {winid} (`integer?`)
 
                 Return: ~
@@ -3224,13 +3224,24 @@ getcharstr([{expr}])                                              *getcharstr()*
                 Return: ~
                   (`string`)
 
+getcmdcomplpat()                                              *getcmdcomplpat()*
+		Return completion pattern of the current command-line.
+		Only works when the command line is being edited, thus
+		requires use of |c_CTRL-\_e| or |c_CTRL-R_=|.
+		Also see |getcmdtype()|, |setcmdpos()|, |getcmdline()|,
+		|getcmdprompt()|, |getcmdcompltype()| and |setcmdline()|.
+		Returns an empty string when completion is not defined.
+
+                Return: ~
+                  (`string`)
+
 getcmdcompltype()                                            *getcmdcompltype()*
 		Return the type of the current command-line completion.
 		Only works when the command line is being edited, thus
 		requires use of |c_CTRL-\_e| or |c_CTRL-R_=|.
 		See |:command-completion| for the return string.
 		Also see |getcmdtype()|, |setcmdpos()|, |getcmdline()|,
-		|getcmdprompt()| and |setcmdline()|.
+		|getcmdprompt()|, |getcmdcomplpat()| and |setcmdline()|.
 		Returns an empty string when completion is not defined.
 
                 Return: ~
@@ -3351,6 +3362,7 @@ getcompletion({pat}, {type} [, {filtered}])                    *getcompletion()*
 		runtime		|:runtime| completion
 		scriptnames	sourced script names |:scriptnames|
 		shellcmd	Shell command
+		shellcmdline	Shell command line with filename arguments
 		sign		|:sign| suboptions
 		syntax		syntax file names |'syntax'|
 		syntime		|:syntime| suboptions
@@ -5746,7 +5758,7 @@ luaeval({expr} [, {expr}])                                           *luaeval()*
 
 map({expr1}, {expr2})                                                    *map()*
 		{expr1} must be a |List|, |String|, |Blob| or |Dictionary|.
-		When {expr1} is a |List|| or |Dictionary|, replace each
+		When {expr1} is a |List| or |Dictionary|, replace each
 		item in {expr1} with the result of evaluating {expr2}.
 		For a |Blob| each byte is replaced.
 		For a |String|, each character, including composing
@@ -8690,7 +8702,7 @@ setcellwidths({list})                                          *setcellwidths()*
 		To clear the overrides pass an empty {list}: >vim
 		   call setcellwidths([])
 
-<		You can use the script $VIMRUNTIME/tools/emoji_list.lua to see
+<		You can use the script $VIMRUNTIME/scripts/emoji_list.lua to see
 		the effect for known emoji characters.  Move the cursor
 		through the text to check if the cell widths of your terminal
 		match with what Vim knows about each emoji.  If it doesn't
@@ -9027,6 +9039,8 @@ setqflist({list} [, {action} [, {what}]])                          *setqflist()*
 			clear the list: >vim
 				call setqflist([], 'r')
 <
+		'u'	Like 'r', but tries to preserve the current selection
+			in the quickfix list.
 		'f'	All the quickfix lists in the quickfix stack are
 			freed.
 
@@ -9083,9 +9097,9 @@ setqflist({list} [, {action} [, {what}]])                          *setqflist()*
 		`:cc 1` to jump to the first position.
 
                 Parameters: ~
-                  • {list} (`any[]`)
+                  • {list} (`vim.quickfix.entry[]`)
                   • {action} (`string?`)
-                  • {what} (`table?`)
+                  • {what} (`vim.fn.setqflist.what?`)
 
                 Return: ~
                   (`any`)
@@ -11597,7 +11611,7 @@ virtcol({expr} [, {list} [, {winid}]])                               *virtcol()*
 <
 
                 Parameters: ~
-                  • {expr} (`string|integer[]`)
+                  • {expr} (`string|any[]`)
                   • {list} (`boolean?`)
                   • {winid} (`integer?`)
 
@@ -11691,7 +11705,7 @@ wildmenumode()                                                  *wildmenumode()*
 		For example to make <c-j> work like <down> in wildmode, use: >vim
 		    cnoremap <expr> <C-j> wildmenumode() ? "\<Down>\<Tab>" : "\<c-j>"
 <
-		(Note, this needs the 'wildcharm' option set appropriately).
+		(Note: this needs the 'wildcharm' option set appropriately).
 
                 Return: ~
                   (`any`)