feat(messages): cleanup Lua error messages

"Error" in error messages is redundant. Just provide the context, don't
say "Error ...".

1 files changed, 5 insertions, 11 deletions

diff --git a/test/functional/lua/vim_spec.lua b/test/functional/lua/vim_spec.lua
index 9693beb242..420d894635 100644
--- a/test/functional/lua/vim_spec.lua
+++ b/test/functional/lua/vim_spec.lua
@@ -3376,7 +3376,7 @@ describe('lua stdlib', function()
       local errmsg = api.nvim_get_vvar('errmsg')
       matches(
         [[
-^Error executing vim%.on%_key%(%) callbacks:.*
+^vim%.on%_key%(%) callbacks:.*
 With ns%_id %d+: .*: Dumb Error
 stack traceback:
 .*: in function 'error'
@@ -3506,19 +3506,13 @@ stack traceback:
 
       api.nvim_buf_set_lines(0, 0, -1, true, { '54321' })
 
-      local function cleanup_msg(msg)
-        return msg:gsub('^Error .*\nWith ns%_id %d+: ', '')
-      end
-
       feed('x')
       eq(1, exec_lua [[ return n_call ]])
-
       eq(1, exec_lua [[ return vim.on_key(nil, nil) ]])
-
-      eq('', cleanup_msg(eval('v:errmsg')))
+      eq('', eval('v:errmsg'))
       feed('x')
       eq(2, exec_lua [[ return n_call ]])
-      eq('return string must be empty', cleanup_msg(eval('v:errmsg')))
+      matches('return string must be empty', eval('v:errmsg'))
       command('let v:errmsg = ""')
 
       eq(0, exec_lua [[ return vim.on_key(nil, nil) ]])
@@ -3526,7 +3520,7 @@ stack traceback:
       feed('x')
       eq(2, exec_lua [[ return n_call ]])
       expect('21')
-      eq('', cleanup_msg(eval('v:errmsg')))
+      eq('', eval('v:errmsg'))
     end)
   end)
 
@@ -3991,7 +3985,7 @@ stack traceback:
         pcall_err(exec_lua, [[vim.api.nvim_win_call(0, function() vim.cmd 'fooooo' end)]])
       )
       eq(
-        'Error executing lua: [string "<nvim>"]:0: fooooo',
+        'Lua: [string "<nvim>"]:0: fooooo',
         pcall_err(exec_lua, [[vim.api.nvim_win_call(0, function() error('fooooo') end)]])
       )
     end)