Mercurial > vim
changeset 19348:b6da81589f8c v8.2.0232
patch 8.2.0232: the :compiler command causes a crash
Commit: https://github.com/vim/vim/commit/165315584d6587e287f54d6c8820e050114b5694
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Feb 8 16:00:46 2020 +0100
patch 8.2.0232: the :compiler command causes a crash
Problem: The :compiler command causes a crash. (Daniel Steinberg)
Solution: Do not use the script index if it isn't set.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 08 Feb 2020 16:15:04 +0100 |
| parents | 11bb83791081 |
| children | dd7206f7e1ea |
| files | src/ex_docmd.c src/testdir/test_compiler.vim src/version.c |
| diffstat | 3 files changed, 14 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -2495,7 +2495,8 @@ do_one_cmd( #ifdef FEAT_EVAL // Set flag that any command was executed, used by ex_vim9script(). - if (getline_equal(ea.getline, ea.cookie, getsourceline)) + if (getline_equal(ea.getline, ea.cookie, getsourceline) + && current_sctx.sc_sid > 0) SCRIPT_ITEM(current_sctx.sc_sid)->sn_had_command = TRUE; /*
--- a/src/testdir/test_compiler.vim +++ b/src/testdir/test_compiler.vim @@ -1,6 +1,7 @@ " Test the :compiler command source check.vim +source shared.vim func Test_compiler() if !executable('perl') @@ -48,6 +49,15 @@ func Test_compiler_without_arg() call assert_match(runtime .. '/compiler/xmlwf.vim$', a[-1]) endfunc +" Test executing :compiler from the command line, not from a script +func Test_compiler_commandline() + call system(GetVimCommandClean() .. ' --not-a-term -c "compiler gcc" -c "call writefile([b:current_compiler], ''XcompilerOut'')" -c "quit"') + call assert_equal(0, v:shell_error) + call assert_equal(["gcc"], readfile('XcompilerOut')) + + call delete('XcompilerOut') +endfunc + func Test_compiler_completion() call feedkeys(":compiler \<C-A>\<C-B>\"\<CR>", 'tx') call assert_match('^"compiler ant bcc .* xmlwf$', @:)