To: vim_dev@googlegroups.com Subject: Patch 8.2.1680 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1680 Problem: Vim9: line number for compare error is wrong. Solution: Set SOURCING_LNUM. (closes #6936) Files: src/vim9execute.c, src/testdir/test_vim9_expr.vim *** ../vim-8.2.1679/src/vim9execute.c 2020-09-12 19:11:19.675415067 +0200 --- src/vim9execute.c 2020-09-14 16:41:27.021959505 +0200 *************** *** 2126,2131 **** --- 2126,2132 ---- exptype_T exptype = iptr->isn_arg.op.op_type; int ic = iptr->isn_arg.op.op_ic; + SOURCING_LNUM = iptr->isn_lnum; typval_compare(tv1, tv2, exptype, ic); clear_tv(tv2); --ectx.ec_stack.ga_len; *** ../vim-8.2.1679/src/testdir/test_vim9_expr.vim 2020-09-12 21:26:37.922233032 +0200 --- src/testdir/test_vim9_expr.vim 2020-09-14 16:45:43.820898734 +0200 *************** *** 481,486 **** --- 481,487 ---- set noignorecase CheckDefFailure(["let x = 'a' == xxx"], 'E1001:', 1) + CheckDefExecFailure(['let items: any', 'eval 1', 'eval 2', 'if items == []', 'endif'], 'E691:', 4) let bb = 0z3f assert_equal(true, 0z3f == bb) *** ../vim-8.2.1679/src/version.c 2020-09-14 16:37:30.906845912 +0200 --- src/version.c 2020-09-14 16:42:49.469611558 +0200 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 1680, /**/ -- It is illegal to take more than three sips of beer at a time while standing. [real standing law in Texas, United States of America] /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///