From b444ee761a2956a996a75d923281c51fa1a759f3 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Mon, 20 Feb 2023 15:25:13 +0000 Subject: [PATCH] patch 9.0.1332: crash when using buffer-local user command in cmdline window MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Problem: Crash when using buffer-local user command in cmdline window. (Karl Yngve Lervåg) Solution: Use the right buffer to find the user command. (closes #12030, closes #12029) --- src/testdir/test_usercommands.vim | 9 +++++++++ src/usercmd.c | 2 +- src/version.c | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_usercommands.vim b/src/testdir/test_usercommands.vim index d8b4cb40e..1e1856727 100644 --- a/src/testdir/test_usercommands.vim +++ b/src/testdir/test_usercommands.vim @@ -856,6 +856,15 @@ func Test_buflocal_ambiguous_usercmd() bw! endfunc +" Test for using buffer-local user command from cmdwin. +func Test_buflocal_usercmd_cmdwin() + new + command -buffer TestCmd edit Test + " This used to crash Vim + call assert_fails("norm q::TestCmd\", 'E11:') + bw! +endfunc + " Test for using a multibyte character in a user command func Test_multibyte_in_usercmd() command SubJapanesePeriodToDot exe "%s/\u3002/./g" diff --git a/src/usercmd.c b/src/usercmd.c index 44fa578f6..7d844620b 100644 --- a/src/usercmd.c +++ b/src/usercmd.c @@ -1838,7 +1838,7 @@ do_ucmd(exarg_T *eap) if (eap->cmdidx == CMD_USER) cmd = USER_CMD(eap->useridx); else - cmd = USER_CMD_GA(&curbuf->b_ucmds, eap->useridx); + cmd = USER_CMD_GA(&prevwin_curwin()->w_buffer->b_ucmds, eap->useridx); /* * Replace <> in the command by the arguments. diff --git a/src/version.c b/src/version.c index 4c1282327..0095489c7 100644 --- a/src/version.c +++ b/src/version.c @@ -695,6 +695,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1332, /**/ 1331, /**/ -- 2.50.1