vim-patch:e46a44050562

Runtime file updates

https://github.com/vim/vim/commit/e46a4405056276b4cbdacee76b11f85c8ea1830b

Co-authored-by: Bram Moolenaar <Bram@vim.org>

3 files changed, 18 insertions, 21 deletions

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index af7bcf4392..079052b658 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -2662,7 +2662,7 @@ getmatches([{win}])                                               *getmatches()*
 <
 
 getmousepos()                                                    *getmousepos()*
-		Returns a Dictionary with the last known position of the
+		Returns a |Dictionary| with the last known position of the
 		mouse.  This can be used in a mapping for a mouse click.  The
 		items are:
 			screenrow	screen row
@@ -5741,7 +5741,7 @@ screenchar({row}, {col})                                          *screenchar()*
 		Returns -1 when row or col is out of range.
 
 screenchars({row}, {col})                                        *screenchars()*
-		The result is a List of Numbers.  The first number is the same
+		The result is a |List| of Numbers.  The first number is the same
 		as what |screenchar()| returns.  Further numbers are
 		composing characters on top of the base character.
 		This is mainly to be used for testing.
@@ -5908,7 +5908,7 @@ searchcount([{options}])                                         *searchcount()*
 		without the "S" flag in 'shortmess'.  This works even if
 		'shortmess' does contain the "S" flag.
 
-		This returns a Dictionary. The dictionary is empty if the
+		This returns a |Dictionary|. The dictionary is empty if the
 		previous pattern was not set and "pattern" was not specified.
 
 		  key		type		meaning ~
@@ -5990,7 +5990,7 @@ searchcount([{options}])                                         *searchcount()*
 			" search again
 			call searchcount()
 <
-		{options} must be a Dictionary. It can contain:
+		{options} must be a |Dictionary|. It can contain:
 		  key		type		meaning ~
 		  recompute	|Boolean|	if |TRUE|, recompute the count
 						like |n| or |N| was executed.
@@ -7391,11 +7391,10 @@ state([{what}])                                                        *state()*
 		something is busy:
 		    m	halfway a mapping, :normal command, feedkeys() or
 			stuffed command
-		    o	operator pending or waiting for a command argument,
-			e.g. after |f|
+		    o	operator pending, e.g. after |d|
 		    a	Insert mode autocomplete active
 		    x	executing an autocommand
-		    S	not triggering SafeState
+		    S	not triggering SafeState, e.g. after |f| or a count
 		    c	callback invoked, including timer (repeats for
 			recursiveness up to "ccc")
 		    s	screen has scrolled for messages
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 86d3dd21a1..e393844724 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -3230,7 +3230,7 @@ function vim.fn.getmarklist(buf) end
 --- @return any
 function vim.fn.getmatches(win) end
 
---- Returns a Dictionary with the last known position of the
+--- Returns a |Dictionary| with the last known position of the
 --- mouse.  This can be used in a mapping for a mouse click.  The
 --- items are:
 ---   screenrow  screen row
@@ -6878,7 +6878,7 @@ function vim.fn.screenattr(row, col) end
 --- @return any
 function vim.fn.screenchar(row, col) end
 
---- The result is a List of Numbers.  The first number is the same
+--- The result is a |List| of Numbers.  The first number is the same
 --- as what |screenchar()| returns.  Further numbers are
 --- composing characters on top of the base character.
 --- This is mainly to be used for testing.
@@ -7069,7 +7069,7 @@ function vim.fn.search(pattern, flags, stopline, timeout, skip) end
 --- without the "S" flag in 'shortmess'.  This works even if
 --- 'shortmess' does contain the "S" flag.
 ---
---- This returns a Dictionary. The dictionary is empty if the
+--- This returns a |Dictionary|. The dictionary is empty if the
 --- previous pattern was not set and "pattern" was not specified.
 ---
 ---   key    type    meaning ~
@@ -7151,7 +7151,7 @@ function vim.fn.search(pattern, flags, stopline, timeout, skip) end
 ---   " search again
 ---   call searchcount()
 --- <
---- {options} must be a Dictionary. It can contain:
+--- {options} must be a |Dictionary|. It can contain:
 ---   key    type    meaning ~
 ---   recompute  |Boolean|  if |TRUE|, recompute the count
 ---         like |n| or |N| was executed.
@@ -8766,11 +8766,10 @@ function vim.fn.srand(expr) end
 --- something is busy:
 ---     m  halfway a mapping, :normal command, feedkeys() or
 ---   stuffed command
----     o  operator pending or waiting for a command argument,
----   e.g. after |f|
+---     o  operator pending, e.g. after |d|
 ---     a  Insert mode autocomplete active
 ---     x  executing an autocommand
----     S  not triggering SafeState
+---     S  not triggering SafeState, e.g. after |f| or a count
 ---     c  callback invoked, including timer (repeats for
 ---   recursiveness up to "ccc")
 ---     s  screen has scrolled for messages
diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua
index 544df33249..f6ccc803c0 100644
--- a/src/nvim/eval.lua
+++ b/src/nvim/eval.lua
@@ -4012,7 +4012,7 @@ M.funcs = {
   },
   getmousepos = {
     desc = [=[
-      Returns a Dictionary with the last known position of the
+      Returns a |Dictionary| with the last known position of the
       mouse.  This can be used in a mapping for a mouse click.  The
       items are:
       	screenrow	screen row
@@ -8296,7 +8296,7 @@ M.funcs = {
     args = 2,
     base = 1,
     desc = [=[
-      The result is a List of Numbers.  The first number is the same
+      The result is a |List| of Numbers.  The first number is the same
       as what |screenchar()| returns.  Further numbers are
       composing characters on top of the base character.
       This is mainly to be used for testing.
@@ -8511,7 +8511,7 @@ M.funcs = {
       without the "S" flag in 'shortmess'.  This works even if
       'shortmess' does contain the "S" flag.
 
-      This returns a Dictionary. The dictionary is empty if the
+      This returns a |Dictionary|. The dictionary is empty if the
       previous pattern was not set and "pattern" was not specified.
 
         key		type		meaning ~
@@ -8593,7 +8593,7 @@ M.funcs = {
       	" search again
       	call searchcount()
       <
-      {options} must be a Dictionary. It can contain:
+      {options} must be a |Dictionary|. It can contain:
         key		type		meaning ~
         recompute	|Boolean|	if |TRUE|, recompute the count
       				like |n| or |N| was executed.
@@ -10477,11 +10477,10 @@ M.funcs = {
       something is busy:
           m	halfway a mapping, :normal command, feedkeys() or
       	stuffed command
-          o	operator pending or waiting for a command argument,
-      	e.g. after |f|
+          o	operator pending, e.g. after |d|
           a	Insert mode autocomplete active
           x	executing an autocommand
-          S	not triggering SafeState
+          S	not triggering SafeState, e.g. after |f| or a count
           c	callback invoked, including timer (repeats for
       	recursiveness up to "ccc")
           s	screen has scrolled for messages