thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.5023: substitute overwrites allocated buffer

Browse Source 
Problem:    Substitute overwrites allocated buffer.
Solution:   Disallow undo when in a substitute command.
This commit is contained in:
Bram Moolenaar
2022-05-26 15:56:23 +01:00
parent 9bcb9ca9c7
commit 338f1fc0ee
4 changed files with 51 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/normal.c
View File

@@ -183,6 +183,22 @@ find_command(int cmdchar)
return idx;
}
/*
* If currently editing a cmdline or text is locked: beep and give an error
* message, return TRUE.
*/
static int
check_text_locked(oparg_T *oap)
{
if (text_locked())
{
clearopbeep(oap);
text_locked_msg();
return TRUE;
}
return FALSE;
}
/*
* Handle the count before a normal command and set cap->count0.
*/
@@ -802,14 +818,9 @@ normal_cmd(
goto normal_end;
}
if (text_locked() && (nv_cmds[idx].cmd_flags & NV_NCW))
{
// This command is not allowed while editing a cmdline: beep.
clearopbeep(oap);
text_locked_msg();
goto normal_end;
}
if ((nv_cmds[idx].cmd_flags & NV_NCW) && curbuf_locked())
if ((nv_cmds[idx].cmd_flags & NV_NCW)
&& (check_text_locked(oap) || curbuf_locked()))
// this command is not allowed now
goto normal_end;
// In Visual/Select mode, a few keys are handled in a special way.
@@ -4049,12 +4060,8 @@ nv_gotofile(cmdarg_T *cap)
char_u *ptr;
linenr_T lnum = -1;
if (text_locked())
{
clearopbeep(cap->oap);
text_locked_msg();
if (check_text_locked(cap->oap))
return;
}
if (curbuf_locked())
{
clearop(cap->oap);
@@ -6182,14 +6189,7 @@ nv_g_cmd(cmdarg_T *cap)
// "gQ": improved Ex mode
case 'Q':
if (text_locked())
{
clearopbeep(cap->oap);
text_locked_msg();
break;
}
if (!checkclearopq(oap))
if (!check_text_locked(cap->oap) && !checkclearopq(oap))
do_exmode(TRUE);
break;