diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-10-27 13:04:08 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-10-27 13:07:51 +0800 |
| commit | 25cf4f2fc712530a65dc3b533508c36d0439b728 (patch) | |
| tree | 450cf5aa4d6b667527b9114e2a2c32d30be1e8c5 | |
| parent | 1fe31651bce5021ea6d6dfe6fa426fde7795a77f (diff) | |
| download | rneovim-25cf4f2fc712530a65dc3b533508c36d0439b728.tar.gz rneovim-25cf4f2fc712530a65dc3b533508c36d0439b728.tar.bz2 rneovim-25cf4f2fc712530a65dc3b533508c36d0439b728.zip | |
vim-patch:8.2.2653: build failure
Problem: Build failure.
Solution: Add missing changes.
https://github.com/vim/vim/commit/3a0f092ac0dbdd4ce71f9c4abe020e89f13df36c
Omit E1176: only applicable to Vim9 script.
Co-authored-by: Bram Moolenaar <Bram@vim.org>
| -rw-r--r-- | src/nvim/eval/typval.c | 2 | ||||
| -rw-r--r-- | src/nvim/globals.h | 2 | ||||
| -rw-r--r-- | test/functional/vimscript/exepath_spec.lua | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c index 3b513bfafb..fb601c4307 100644 --- a/src/nvim/eval/typval.c +++ b/src/nvim/eval/typval.c @@ -43,7 +43,7 @@ static char e_string_required_for_argument_nr[] = N_("E1174: String required for argument %d"); static char e_non_empty_string_required_for_argument_nr[] - = N_("E1142: Non-empty string required for argument %d"); + = N_("E1175: Non-empty string required for argument %d"); static char e_number_required_for_argument_nr[] = N_("E1210: Number required for argument %d"); diff --git a/src/nvim/globals.h b/src/nvim/globals.h index 5a38585bb1..f6fbd6ffe9 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -997,8 +997,6 @@ EXTERN char e_luv_api_disabled[] INIT(= N_("E5560: %s must not be called in a lu EXTERN char e_floatonly[] INIT(= N_("E5601: Cannot close window, only floating window would remain")); EXTERN char e_floatexchange[] INIT(= N_("E5602: Cannot exchange or rotate float")); -EXTERN char e_non_empty_string_required[] INIT(= N_("E1142: Non-empty string required")); - EXTERN char e_cannot_define_autocommands_for_all_events[] INIT(= N_("E1155: Cannot define autocommands for ALL events")); EXTERN char e_resulting_text_too_long[] INIT(= N_("E1240: Resulting text too long")); diff --git a/test/functional/vimscript/exepath_spec.lua b/test/functional/vimscript/exepath_spec.lua index 439dd96fcd..db96b79743 100644 --- a/test/functional/vimscript/exepath_spec.lua +++ b/test/functional/vimscript/exepath_spec.lua @@ -23,7 +23,7 @@ describe('exepath()', function() for _, input in ipairs({'v:null', 'v:true', 'v:false', '{}', '[]'}) do eq('Vim(call):E1174: String required for argument 1', exc_exec('call exepath('..input..')')) end - eq('Vim(call):E1142: Non-empty string required for argument 1', exc_exec('call exepath("")')) + eq('Vim(call):E1175: Non-empty string required for argument 1', exc_exec('call exepath("")')) command('let $PATH = fnamemodify("./test/functional/fixtures/bin", ":p")') for _, input in ipairs({'v:null', 'v:true', 'v:false'}) do eq('Vim(call):E1174: String required for argument 1', exc_exec('call exepath('..input..')')) |