aboutsummaryrefslogtreecommitdiff
path: root/src/nvim
diff options
context:
space:
mode:
authorJosh Rahm <joshuarahm@gmail.com>2023-01-17 17:32:40 -0700
committerJosh Rahm <joshuarahm@gmail.com>2023-01-17 17:32:40 -0700
commit38b913062a8f3cef4d6f6a3db840e617c2fea95c (patch)
tree4375d14d76ecbda85c7dd52cb072b3ca0445fcff /src/nvim
parenta466b96406dccccf8702288f5d8ed0b245ebb0d7 (diff)
parent9e40b6e9e1bc67f2d856adb837ee64dd0e25b717 (diff)
downloadrneovim-38b913062a8f3cef4d6f6a3db840e617c2fea95c.tar.gz
rneovim-38b913062a8f3cef4d6f6a3db840e617c2fea95c.tar.bz2
rneovim-38b913062a8f3cef4d6f6a3db840e617c2fea95c.zip
Merge remote-tracking branch 'origin/usermarks' into 20220114-mix
Diffstat (limited to 'src/nvim')
-rw-r--r--src/nvim/eval/funcs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
index 0a02ba5a03..4ad3f5860b 100644
--- a/src/nvim/eval/funcs.c
+++ b/src/nvim/eval/funcs.c
@@ -3139,6 +3139,7 @@ static void f_has(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
"title",
"user-commands", // was accidentally included in 5.4
"user_commands",
+ "usermarks",
"vartabs",
"vertsplit",
"vimscript-1",