diff --git a/src/normal.c b/src/normal.c
index e83c4c0..f7a3e84 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -1535,7 +1535,8 @@
 	    {
 		if (hasFolding(oap->start.lnum, &oap->start.lnum, NULL))
 		    oap->start.col = 0;
-		if (hasFolding(curwin->w_cursor.lnum, NULL,
+		if ((curwin->w_cursor.col > 0 || oap->inclusive)
+			&& hasFolding(curwin->w_cursor.lnum, NULL,
 						      &curwin->w_cursor.lnum))
 		    curwin->w_cursor.col = (colnr_T)STRLEN(ml_get_curline());
 	    }
@@ -6001,8 +6002,7 @@
 	    else
 	    {
 		if (has_mbyte)
-		    curwin->w_cursor.col +=
-					 (*mb_ptr2len)(ml_get_cursor());
+		    curwin->w_cursor.col += (*mb_ptr2len)(ml_get_cursor());
 		else
 		    ++curwin->w_cursor.col;
 	    }
@@ -7400,13 +7400,7 @@
 	{
 	    if (cap->count0)
 		stuffnumReadbuff(cap->count0);
-	    // 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)]);
+	    stuffReadbuff(ar[(int)(vim_strchr(str, cap->cmdchar) - str)]);
 	}
     }
     cap->opcount = 0;
diff --git a/src/version.c b/src/version.c
index 1bfe75c..eb2631d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2059,
+/**/
     2058,
 /**/
     2057,