adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 8.2.1294: Vim9: error when using vim9script in TextYankPost

Browse Source 
Problem:    Vim9: error when using vim9script in TextYankPost.
Solution:   Use EX_LOCKOK instead of the EX_CMDWIN flag for command that can
            be used when text is locked. (closes #6529)
This commit is contained in:
Bram Moolenaar
2020-07-25 19:38:18 +02:00
parent 2d6b20d6a9
commit 37394ff752
3 changed files with 338 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

641
src/ex_cmds.h
View File

File diff suppressed because it is too large Load Diff

20
src/ex_docmd.c
View File

@ -2061,12 +2061,22 @@ do_one_cmd(
goto doend;
}
if (text_locked() && !(ea.argt & EX_CMDWIN)
&& !IS_USER_CMDIDX(ea.cmdidx))
if (!IS_USER_CMDIDX(ea.cmdidx))
{
// Command not allowed when editing the command line.
errormsg = _(get_text_locked_msg());
goto doend;
#ifdef FEAT_CMDWIN
if (cmdwin_type != 0 && !(ea.argt & EX_CMDWIN))
{
// Command not allowed in the command line window
errormsg = _(e_cmdwin);
goto doend;
}
#endif
if (text_locked() && !(ea.argt & EX_LOCK_OK))
{
// Command not allowed when text is locked
errormsg = _(get_text_locked_msg());
goto doend;
}
}
// Disallow editing another buffer when "curbuf_lock" is set.

2
src/version.c
View File

@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1294,
/**/
1293,
/**/