forked from aniani/vim
patch 8.2.1294: Vim9: error when using vim9script in TextYankPost
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:
641
src/ex_cmds.h
641
src/ex_cmds.h
File diff suppressed because it is too large
Load Diff
@@ -2061,12 +2061,22 @@ do_one_cmd(
|
|||||||
goto doend;
|
goto doend;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (text_locked() && !(ea.argt & EX_CMDWIN)
|
if (!IS_USER_CMDIDX(ea.cmdidx))
|
||||||
&& !IS_USER_CMDIDX(ea.cmdidx))
|
|
||||||
{
|
{
|
||||||
// Command not allowed when editing the command line.
|
#ifdef FEAT_CMDWIN
|
||||||
errormsg = _(get_text_locked_msg());
|
if (cmdwin_type != 0 && !(ea.argt & EX_CMDWIN))
|
||||||
goto doend;
|
{
|
||||||
|
// 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.
|
// Disallow editing another buffer when "curbuf_lock" is set.
|
||||||
|
|||||||
@@ -754,6 +754,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1294,
|
||||||
/**/
|
/**/
|
||||||
1293,
|
1293,
|
||||||
/**/
|
/**/
|
||||||
|
|||||||
Reference in New Issue
Block a user