mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
patch 8.1.2052: using "x" before a closed fold may delete that fold
Problem: Using "x" before a closed fold may delete that fold. Solution: Do not translate 'x' do "dl". (Christian Brabandt, closes #4927)
This commit is contained in:
12
src/normal.c
12
src/normal.c
@@ -7381,8 +7381,8 @@ nv_optrans(cmdarg_T *cap)
|
||||
|
||||
if (!checkclearopq(cap->oap))
|
||||
{
|
||||
/* In Vi "2D" doesn't delete the next line. Can't translate it
|
||||
* either, because "2." should also not use the count. */
|
||||
// In Vi "2D" doesn't delete the next line. Can't translate it
|
||||
// either, because "2." should also not use the count.
|
||||
if (cap->cmdchar == 'D' && vim_strchr(p_cpo, CPO_HASH) != NULL)
|
||||
{
|
||||
cap->oap->start = curwin->w_cursor;
|
||||
@@ -7400,7 +7400,13 @@ nv_optrans(cmdarg_T *cap)
|
||||
{
|
||||
if (cap->count0)
|
||||
stuffnumReadbuff(cap->count0);
|
||||
stuffReadbuff(ar[(int)(vim_strchr(str, cap->cmdchar) - str)]);
|
||||
// If on an empty line and using 'x' and "l" is included in the
|
||||
// whichwrap option, do not delete the next line.
|
||||
if (cap->cmdchar == 'x' && vim_strchr(p_ww, 'l') != NULL
|
||||
&& gchar_cursor() == NUL)
|
||||
stuffReadbuff((char_u *)"dd");
|
||||
else
|
||||
stuffReadbuff(ar[(int)(vim_strchr(str, cap->cmdchar) - str)]);
|
||||
}
|
||||
}
|
||||
cap->opcount = 0;
|
||||
|
Reference in New Issue
Block a user