]> granicus.if.org Git - vim/commitdiff
updated for version 7.3.396 v7.3.396
authorBram Moolenaar <Bram@vim.org>
Tue, 10 Jan 2012 12:46:22 +0000 (13:46 +0100)
committerBram Moolenaar <Bram@vim.org>
Tue, 10 Jan 2012 12:46:22 +0000 (13:46 +0100)
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)

src/ops.c
src/version.c

index f8341a81ab1807aab25b37a81b91111d86c34176..971e3244dd96542ad258202851a37dc531258f97 100644 (file)
--- 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;
index c33a6f38dfa25f5e7d27ed415423db0c5151d699..e0d926def207736a276348df1c9e6fb720eb54c3 100644 (file)
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    396,
 /**/
     395,
 /**/