updated for version 7.3.761

Problem:    In Visual mode a "-p does not work. (Marcin Szamotulski)
Solution:   Avoid writing to "- before putting it. (Christian Brabandt)

diff --git a/src/normal.c b/src/normal.c
index 869ada37af8eb6209048d5e804d833e5a2a2fd5f..4d0bbdbea524b04f1ba31552efd670ac9bb6c55c 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -9412,14 +9412,15 @@ nv_put(cap)
 # ifdef FEAT_CLIPBOARD
            adjust_clip_reg(&regname);
 # endif
-           if (regname == 0 || regname == '"' || VIM_ISDIGIT(regname)
+           if (regname == 0 || regname == '"'
+                                    || VIM_ISDIGIT(regname) || regname == '-'
 # ifdef FEAT_CLIPBOARD
                    || (clip_unnamed && (regname == '*' || regname == '+'))
 # endif
 
                    )
            {
-               /* the delete is going to overwrite the register we want to
+               /* The delete is going to overwrite the register we want to
                 * put, save it first. */
                reg1 = get_register(regname, TRUE);
            }

diff --git a/src/testdir/test48.in b/src/testdir/test48.in
index 2179fe66481657feac1a4cd1329e2c34d068a004..48f4abbf753f69984868279c5aeb7a03adc3be9c 100644 (file)
--- a/src/testdir/test48.in
+++ b/src/testdir/test48.in
@@ -54,8 +54,12 @@ $5lrxa<-- should be 'x'\e
 ^O\e3li\ 5\e4li\ 5\e4li\ 5   <-- should show the name of a noted text editor\e
 ^o\e4li\19\e4li\19\e4li\19   <-- and its version number\e-dd
 :"
+:" Test for yanking and pasting using the small delete register
+gg/^foo
+dewve"-p
 :wq! test.out
 ENDTEST
+foo, bar
 keyword keyw
 all your base are belong to us
 1 2 3 4 5 6

diff --git a/src/testdir/test48.ok b/src/testdir/test48.ok
index 4fcbe5086e542378f2efd1263e09aa1b6039e807..334cb5a29c16c0b021451add071ae833aeec5f40 100644 (file)
--- a/src/testdir/test48.ok
+++ b/src/testdir/test48.ok
@@ -1,3 +1,4 @@
+, foo
 keyword keyword
 all your base 
 are belong to vim

diff --git a/src/version.c b/src/version.c
index 3f889b6ab7a004ad769adc1d88edc087cfd1ce4b..5e7b397068c448d3cea2a2f2aec43d77ed104bb8 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 */
+/**/
+    761,
 /**/
     760,
 /**/