Merge remote-tracking branch 'origin/usermarks' into HEAD

1 files changed, 34 insertions, 0 deletions

diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 0e2bd83806..4fdee925ad 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -9217,6 +9217,40 @@ return {
       varname = 'p_ut',
     },
     {
+      abbreviation='umf',
+      full_name='usermarkfunc',
+      desc= [=[
+	This option specifies a function to be used to handle any marks
+	that Neovim does not natively handle. This option unlocks all
+	characters to be used as marks by the user.
+
+	The 'usermarkfunc' function is called each time a user mark is read
+	from or written to.
+
+	The 'usermarkfunc' function must take the following parameters:
+
+		{get_or_set} The action being done on this mark (either 'set'
+			or 'get'
+
+		{markname} The name of the mark either being read or .
+
+        In case the action is 'get', the 'usermarkfunc' function should return
+        the content associated with that mark. This can be a number indicating a
+        line number or it could be a dictionary with the keys:
+                
+                {line} the line number
+
+                {col} the column number
+
+                {filename} the filename
+<
+      ]=],
+      short_desc=N_("Function used to define behavior of user-defined marks."),
+      type='string', scope={'buffer'},
+      varname='p_umf',
+      defaults={if_true=""}
+    },
+    {
       abbreviation='urf',
       full_name='userregfunc',
       desc= [=[