Merge pull request #14403 from seandewar/vim-8.2.1933

vim-patch:8.2.{0174,1933,1935,1946,2286,2287}
2025-09-12 22:38:16 +00:00 · 2021-05-09 17:08:21 -04:00
parent f8173df4d7 eef5a627bf
commit d2be261e8d
20 changed files with 551 additions and 22 deletions
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -228,6 +228,7 @@ static struct vimvar {
  VV(VV_EVENT,          "event",            VAR_DICT, VV_RO),
  VV(VV_ECHOSPACE,      "echospace",        VAR_NUMBER, VV_RO),
  VV(VV_ARGV,           "argv",             VAR_LIST, VV_RO),
+  VV(VV_COLLATE,        "collate",          VAR_STRING, VV_RO),
  VV(VV_EXITING,        "exiting",          VAR_NUMBER, VV_RO),
  // Neovim
  VV(VV_STDERR,         "stderr",           VAR_NUMBER, VV_RO),