2 files changed, 3 insertions, 0 deletions
diff --git a/src/ops.c b/src/ops.c
index f8341a81a..971e3244d 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -1648,6 +1648,7 @@ op_delete(oap)
 	    && !oap->block_mode
 #endif
 	    && oap->line_count > 1
+	    && oap->motion_force == NUL
 	    && oap->op_type == OP_DELETE)
     {
 	ptr = ml_get(oap->end.lnum) + oap->end.col;
diff --git a/src/version.c b/src/version.c
index c33a6f38d..e0d926def 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    396,
+/**/
     395,
 /**/
     394,