Mercurial > vim
changeset 32000:bd01cb097120 v9.0.1332
patch 9.0.1332: crash when using buffer-local user command in cmdline window
Commit: https://github.com/vim/vim/commit/b444ee761a2956a996a75d923281c51fa1a759f3
Author: zeertzjq <zeertzjq@outlook.com>
Date: Mon Feb 20 15:25:13 2023 +0000
patch 9.0.1332: crash when using buffer-local user command in cmdline window
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)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 20 Feb 2023 16:30:03 +0100 |
| parents | d2f8f1ebcf7d |
| children | c99521f92536 |
| files | src/testdir/test_usercommands.vim src/usercmd.c src/version.c |
| diffstat | 3 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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\<CR>", 'E11:') + bw! +endfunc + " Test for using a multibyte character in a user command func Test_multibyte_in_usercmd() command SubJapanesePeriodToDot exe "%s/\u3002/./g"
--- 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.