summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-01-10 13:46:22 +0100
committerBram Moolenaar <Bram@vim.org>2012-01-10 13:46:22 +0100
commit64a72303f8048a1288a03b65350c5d6727a78932 (patch)
treea0eda5bfa44d830fbbe34684dd0dd67d0b4aea90 /src
parent66accae33961b02cab7c4ad6cdb1e0bc16da8cb8 (diff)
downloadvim-git-64a72303f8048a1288a03b65350c5d6727a78932.tar.gz
updated for version 7.3.396v7.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)
Diffstat (limited to 'src')
-rw-r--r--src/ops.c1
-rw-r--r--src/version.c2
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,