Mercurial > vim

changeset 4013:6834d6aeae09 v7.3.761

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <bram@vim.org>
date Wed, 12 Dec 2012 18:20:32 +0100
parents 6364a9ae1d61
children 27bfb1674333
files src/normal.c src/testdir/test48.in src/testdir/test48.ok src/version.c
diffstat 4 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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);
 	    }
--- a/src/testdir/test48.in
+++ b/src/testdir/test48.in
@@ -54,8 +54,12 @@ C
are belong to vim
 ^O3li4li4li   <-- should show the name of a noted text editor
 ^o4li4li4li   <-- and its version number-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
--- a/src/testdir/test48.ok
+++ b/src/testdir/test48.ok
@@ -1,3 +1,4 @@
+, foo
 keyword keyword
 all your base 
 are belong to vim
--- a/src/version.c
+++ b/src/version.c
@@ -726,6 +726,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    761,
+/**/
     760,
 /**/
     759,