# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1576262704 -3600
# Node ID f9e41ffd35391828e587dfaa062f97afc18ed615
# Parent  e072b4909f2a23b0d5be7fed11013e01f910807a
patch 8.2.0002: "dj" only deletes first line of closed fold

Commit: https://github.com/vim/vim/commit/3b68123cd271fb781da4055cf1a1cf52f4fee6a5
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Dec 13 19:35:55 2019 +0100

    patch 8.2.0002: "dj" only deletes first line of closed fold

    Problem:    "dj" only deletes first line of closed fold.
    Solution:   Adjust last line of operator for linewise motion. (closes https://github.com/vim/vim/issues/5354)

diff --git a/src/ops.c b/src/ops.c
--- a/src/ops.c
+++ b/src/ops.c
@@ -4233,7 +4233,8 @@ do_pending_operator(cmdarg_T *cap, int o
 	    {
 		if (hasFolding(oap->start.lnum, &oap->start.lnum, NULL))
 		    oap->start.col = 0;
-		if ((curwin->w_cursor.col > 0 || oap->inclusive)
+		if ((curwin->w_cursor.col > 0 || oap->inclusive
+						  || oap->motion_type == MLINE)
 			&& hasFolding(curwin->w_cursor.lnum, NULL,
 						      &curwin->w_cursor.lnum))
 		    curwin->w_cursor.col = (colnr_T)STRLEN(ml_get_curline());
diff --git a/src/testdir/test_fold.vim b/src/testdir/test_fold.vim
--- a/src/testdir/test_fold.vim
+++ b/src/testdir/test_fold.vim
@@ -769,3 +769,28 @@ func Test_fold_delete_with_marker_and_wh
   set fdm& ww&
   bwipe!
 endfunc
+
+func Test_fold_delete_first_line()
+  new
+  call setline(1, [
+	\ '" x {{{1',
+	\ '" a',
+	\ '" aa',
+	\ '" x {{{1',
+	\ '" b',
+	\ '" bb',
+	\ '" x {{{1',
+	\ '" c',
+	\ '" cc',
+	\ ])
+  set foldmethod=marker
+  1
+  normal dj
+  call assert_equal([
+	\ '" x {{{1',
+	\ '" c',
+	\ '" cc',
+	\ ], getline(1,'$'))
+  bwipe!
+  set foldmethod&
+endfunc
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2,
+/**/
     1,
 /**/
     0