updated for version 7.3.760

Problem:    dv_ deletes the white space before the line.
Solution:   Move the cursor to the first non-white. (Christian Brabandt)

diff --git a/src/normal.c b/src/normal.c
index d6773697aa56c2ee6079dcd9cba95ddbe96b7c3b..869ada37af8eb6209048d5e804d833e5a2a2fd5f 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -8628,7 +8628,9 @@ nv_lineop(cap)
     cap->oap->motion_type = MLINE;
     if (cursor_down(cap->count1 - 1L, cap->oap->op_type == OP_NOP) == FAIL)
        clearopbeep(cap->oap);
-    else if (  cap->oap->op_type == OP_DELETE
+    else if (  (cap->oap->op_type == OP_DELETE /* only with linewise motions */
+               && cap->oap->motion_force != 'v'
+               && cap->oap->motion_force != Ctrl_V)
            || cap->oap->op_type == OP_LSHIFT
            || cap->oap->op_type == OP_RSHIFT)
        beginline(BL_SOL | BL_FIX);

diff --git a/src/testdir/test19.in b/src/testdir/test19.in
index cbb4dd2c22ff15d7291bc0e776aecef93a83f8e4..aafa34e521445afcf8fdec25ebbb01daa384dabd 100644 (file)
--- a/src/testdir/test19.in
+++ b/src/testdir/test19.in
@@ -1,4 +1,5 @@
 Tests for "r<Tab>" with 'smarttab' and 'expandtab' set/not set.
+Also test that dv_ works correctly
 
 STARTTEST
 :so small.vim
@@ -16,7 +17,9 @@ r
 :" Test that copyindent works with expandtab set
 :set expandtab smartindent copyindent ts=8 sw=8 sts=8
 o{
-x\e:?^start?,$w! test.out
+x\e:set nosol
+/Second line/
+fwdv_:?^start?,$w! test.out
 :qa!
 ENDTEST
 
@@ -27,3 +30,4 @@ test text
     a cde
     f ghi
 test text
+  Second line beginning with whitespace

diff --git a/src/testdir/test19.ok b/src/testdir/test19.ok
index 23d51507dbf8aed599417f74a95d5e4a0cf54e4d..4146214919a5a435d2b877fae3d8a97170fa6bc3 100644 (file)
--- a/src/testdir/test19.ok
+++ b/src/testdir/test19.ok
@@ -7,3 +7,4 @@ test text
 test text
 {
         x
+  with whitespace

diff --git a/src/version.c b/src/version.c
index e743fae5089c0fd574f91ac72135b6d600b9e1a6..3f889b6ab7a004ad769adc1d88edc087cfd1ce4b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    760,
 /**/
     759,
 /**/