From 925ddd28391aa7bab06ec7e4f7aac34b727ee1d5 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Fri, 30 Oct 2020 19:04:23 -0400
Subject: vim-patch:8.2.1925: list/dict test fails

Problem:    List/dict test fails.
Solution:   Correct expected exception.
https://github.com/vim/vim/commit/6d967125ad87b1c2a9467357286c3514d5dd1c40

Cherry-pick e_dictkey[] change from patch 8.2.1924.

N/A patches for version.c:

vim-patch:8.2.1929: MS-Windows: problem loading Perl 5.32

Problem:    MS-Windows: problem loading Perl 5.32.
Solution:   Define NO_THREAD_SAFE_LOCALE. (Ken Takata, closes vim/vim#7234)
https://github.com/vim/vim/commit/0289065e41ce3148f929e16a55aa3b161c80576f

vim-patch:8.2.1932: compiler warnings when building with Athena GUI

Problem:    Compiler warnings when building with Athena GUI.
Solution:   Fix function signatures.
https://github.com/vim/vim/commit/963734e316bd17dd7290abcac28b875435d06381
---
 test/functional/eval/null_spec.lua                      | 2 +-
 test/functional/legacy/055_list_and_dict_types_spec.lua | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/functional/eval/null_spec.lua b/test/functional/eval/null_spec.lua
index db0a706319..fa8f7d873f 100644
--- a/test/functional/eval/null_spec.lua
+++ b/test/functional/eval/null_spec.lua
@@ -132,7 +132,7 @@ describe('NULL', function()
   end)
   describe('dict', function()
     it('does not crash when indexing NULL dict', function()
-      eq('\nE716: Key not present in Dictionary: test\nE15: Invalid expression: v:_null_dict.test',
+      eq('\nE716: Key not present in Dictionary: "test"\nE15: Invalid expression: v:_null_dict.test',
          redir_exec('echo v:_null_dict.test'))
     end)
     null_expr_test('makes extend error out', 'extend(D, {})', 'E742: Cannot change value of extend() argument', 0)
diff --git a/test/functional/legacy/055_list_and_dict_types_spec.lua b/test/functional/legacy/055_list_and_dict_types_spec.lua
index 91ba8bb106..4d71a526c1 100644
--- a/test/functional/legacy/055_list_and_dict_types_spec.lua
+++ b/test/functional/legacy/055_list_and_dict_types_spec.lua
@@ -229,7 +229,7 @@ describe('list and dictionary types', function()
       try
 	      let n = d[1500]
       catch
-	      $put =substitute(v:exception, '\v(.{14}).*( \d{4}).*', '\1\2', '')
+	      $put = substitute(v:exception, '\v(.{14}).*( \"\d{4}\").*', '\1\2', '')
       endtry
       " Lookup each items.
       for i in range(1500)
@@ -260,7 +260,7 @@ describe('list and dictionary types', function()
     expect([[
 
       3000 2900 2001 1600 1501
-      Vim(let):E716: 1500
+      Vim(let):E716: "1500"
       NONE 2999
       33=999
       {'33': 999}]])
-- 
cgit