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)
diff --git a/src/normal.c b/src/normal.c
index d169f26..e83c4c0 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -7381,8 +7381,8 @@
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 @@
{
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;
diff --git a/src/testdir/test_fold.vim b/src/testdir/test_fold.vim
index 7aef51f..824a4f2 100644
--- a/src/testdir/test_fold.vim
+++ b/src/testdir/test_fold.vim
@@ -757,3 +757,15 @@
bwipe!
bwipe!
endfunc
+
+func Test_fold_delete_with_marker_and_whichwrap()
+ new
+ let content1 = ['']
+ let content2 = ['folded line 1 "{{{1', ' test', ' test2', ' test3', '', 'folded line 2 "{{{1', ' test', ' test2', ' test3']
+ call setline(1, content1 + content2)
+ set fdm=marker ww+=l
+ normal! x
+ call assert_equal(content2, getline(1, '$'))
+ set fdm& ww&
+ bwipe!
+endfunc
diff --git a/src/version.c b/src/version.c
index af656f2..c0d161a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2052,
+/**/
2051,
/**/
2050,