Patch 9.0.0684

4 views
Skip to first unread message

Bram Moolenaar

unread,
Oct 7, 2022, 10:11:18 AM10/7/22
to vim...@googlegroups.com

Patch 9.0.0684 (after 9.0.0683)
Problem: Skipped :exe command fails compilation on MS-Windows.
Solution: Adjust return value when skipping.
Files: src/vim9compile.c, src/vim9instr.c


*** ../vim-9.0.0683/src/vim9compile.c 2022-10-07 14:31:04.320852668 +0100
--- src/vim9compile.c 2022-10-07 15:06:10.713458293 +0100
***************
*** 3339,3345 ****
case CMD_echowindow:
{
long cmd_count = get_cmd_count(line, &ea);
! if (cmd_count >= 0)
line = compile_mult_expr(p, ea.cmdidx,
cmd_count, &cctx);
}
--- 3339,3347 ----
case CMD_echowindow:
{
long cmd_count = get_cmd_count(line, &ea);
! if (cmd_count < 0)
! line = NULL;
! else
line = compile_mult_expr(p, ea.cmdidx,
cmd_count, &cctx);
}
*** ../vim-9.0.0683/src/vim9instr.c 2022-10-07 14:31:04.324852691 +0100
--- src/vim9instr.c 2022-10-07 15:08:06.209043887 +0100
***************
*** 1876,1881 ****
--- 1876,1882 ----
{
isn_T *isn;

+ RETURN_OK_IF_SKIP(cctx);
if ((isn = generate_instr_drop(cctx, isn_type, count)) == NULL)
return FAIL;
isn->isn_arg.number = count;
*** ../vim-9.0.0683/src/version.c 2022-10-07 14:31:04.324852691 +0100
--- src/version.c 2022-10-07 15:09:03.592865918 +0100
***************
*** 701,702 ****
--- 701,704 ----
{ /* Add new patch number below this line */
+ /**/
+ 684,
/**/

--
E M A C S
s e l o h
c t t n i
a a t f
p r t
e o
l

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Reply all
Reply to author
Forward
0 new messages