diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-10-30 19:04:23 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-11-01 09:28:33 -0500 |
| commit | 925ddd28391aa7bab06ec7e4f7aac34b727ee1d5 (patch) | |
| tree | 4d0aca6770eb012e966252506d2601ea26a58f55 /src | |
| parent | ca7449db46062098cc9b0c84401655cba7d3a53f (diff) | |
| download | rneovim-925ddd28391aa7bab06ec7e4f7aac34b727ee1d5.tar.gz rneovim-925ddd28391aa7bab06ec7e4f7aac34b727ee1d5.tar.bz2 rneovim-925ddd28391aa7bab06ec7e4f7aac34b727ee1d5.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/globals.h | 6 | ||||
| -rw-r--r-- | src/nvim/testdir/test_listdict.vim | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/nvim/globals.h b/src/nvim/globals.h index 2db8689a56..9e52a4a938 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -941,8 +941,10 @@ EXTERN char_u e_readonly[] INIT(= N_( EXTERN char_u e_readonlyvar[] INIT(= N_( "E46: Cannot change read-only variable \"%.*s\"")); EXTERN char_u e_dictreq[] INIT(= N_("E715: Dictionary required")); -EXTERN char_u e_toomanyarg[] INIT(= N_("E118: Too many arguments for function: %s")); -EXTERN char_u e_dictkey[] INIT(= N_("E716: Key not present in Dictionary: %s")); +EXTERN char_u e_toomanyarg[] INIT(= N_( + "E118: Too many arguments for function: %s")); +EXTERN char_u e_dictkey[] INIT(= N_( + "E716: Key not present in Dictionary: \"%s\"")); EXTERN char_u e_listreq[] INIT(= N_("E714: List required")); EXTERN char_u e_listdictarg[] INIT(= N_( "E712: Argument of %s must be a List or Dictionary")); diff --git a/src/nvim/testdir/test_listdict.vim b/src/nvim/testdir/test_listdict.vim index 31a8b48d37..8e2a987e74 100644 --- a/src/nvim/testdir/test_listdict.vim +++ b/src/nvim/testdir/test_listdict.vim @@ -199,9 +199,9 @@ func Test_dict_big() try let n = d[1500] catch - let str=substitute(v:exception, '\v(.{14}).*( \d{4}).*', '\1\2', '') + let str = substitute(v:exception, '\v(.{14}).*( "\d{4}").*', '\1\2', '') endtry - call assert_equal('Vim(let):E716: 1500', str) + call assert_equal('Vim(let):E716: "1500"', str) " lookup each items for i in range(1500) |