From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 10 Jan 2012 12:46:22 +0000 (+0100)
Subject: updated for version 7.3.396
X-Git-Tag: v7.3.396
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=64a72303f8048a1288a03b65350c5d6727a78932;p=vim

updated for version 7.3.396
Problem:    After forcing an operator to be characterwise it can still become
            linewise when spanning whole lines.
Solution:   Don't make the operator linewise when motion_force was set.
            (Christian Brabandt)
---

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
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    396,
 /**/
     395,
 /**/