From 6750d00fe96a04ab19cfc55fb406f6b40dbf970f Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Wed, 24 Apr 2024 16:20:19 +0800 Subject: vim-patch:8.2.4603: sourcing buffer lines is too complicated Problem: Sourcing buffer lines is too complicated. Solution: Simplify the code. Make it possible to source Vim9 script lines. (Yegappan Lakshmanan, closes vim/vim#9974) https://github.com/vim/vim/commit/85b43c6cb7d56919e245622f4e42db6d8bee4194 This commit changes the behavior of sourcing buffer lines to always have a script ID, although sourcing the same buffer always produces the same script ID. vim-patch:9.1.0372: Calling CLEAR_FIELD() on the same struct twice Problem: Calling CLEAR_FIELD() on the same struct twice. Solution: Remove the second CLEAR_FIELD(). Move the assignment of cookie.sourceing_lnum (zeertzjq). closes: vim/vim#14627 https://github.com/vim/vim/commit/f68517c1671dfedcc1555da50bc0b3de6d2842f6 Co-authored-by: Yegappan Lakshmanan --- test/functional/core/exit_spec.lua | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'test/functional/core/exit_spec.lua') diff --git a/test/functional/core/exit_spec.lua b/test/functional/core/exit_spec.lua index 65f6bc28a6..aafad4c8a5 100644 --- a/test/functional/core/exit_spec.lua +++ b/test/functional/core/exit_spec.lua @@ -97,14 +97,26 @@ describe(':cquit', function() end) it('exits with redir msg for multiple exit codes after :cquit 1 2', function() - test_cq('cquit 1 2', nil, 'nvim_exec2(): Vim(cquit):E488: Trailing characters: 2: cquit 1 2') + test_cq( + 'cquit 1 2', + nil, + 'nvim_exec2(), line 1: Vim(cquit):E488: Trailing characters: 2: cquit 1 2' + ) end) it('exits with redir msg for non-number exit code after :cquit X', function() - test_cq('cquit X', nil, 'nvim_exec2(): Vim(cquit):E488: Trailing characters: X: cquit X') + test_cq( + 'cquit X', + nil, + 'nvim_exec2(), line 1: Vim(cquit):E488: Trailing characters: X: cquit X' + ) end) it('exits with redir msg for negative exit code after :cquit -1', function() - test_cq('cquit -1', nil, 'nvim_exec2(): Vim(cquit):E488: Trailing characters: -1: cquit -1') + test_cq( + 'cquit -1', + nil, + 'nvim_exec2(), line 1: Vim(cquit):E488: Trailing characters: -1: cquit -1' + ) end) end) -- cgit