aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.1.2052: using "x" before a closed fold may delete that fold

Browse Source 
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:
Bram Moolenaar
2019-09-17 22:42:55 +02:00
parent 705918f9f7
commit 7a9bd7c1e0
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/normal.c
View File

@@ -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;