Blob Blame History Raw
To: vim_dev@googlegroups.com
Subject: Patch 7.3.761
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.3.761
Problem:    In Visual mode a "-p does not work. (Marcin Szamotulski)
Solution:   Avoid writing to "- before putting it. (Christian Brabandt)
Files:	    src/normal.c, src/testdir/test48.in, src/testdir/test48.ok


*** ../vim-7.3.760/src/normal.c	2012-12-12 17:33:26.000000000 +0100
--- src/normal.c	2012-12-12 18:11:06.000000000 +0100
***************
*** 9412,9425 ****
  # ifdef FEAT_CLIPBOARD
  	    adjust_clip_reg(&regname);
  # endif
! 	    if (regname == 0 || regname == '"' || VIM_ISDIGIT(regname)
  # ifdef FEAT_CLIPBOARD
  		    || (clip_unnamed && (regname == '*' || regname == '+'))
  # endif
  
  		    )
  	    {
! 		/* the delete is going to overwrite the register we want to
  		 * put, save it first. */
  		reg1 = get_register(regname, TRUE);
  	    }
--- 9412,9426 ----
  # ifdef FEAT_CLIPBOARD
  	    adjust_clip_reg(&regname);
  # endif
!            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
  		 * put, save it first. */
  		reg1 = get_register(regname, TRUE);
  	    }
*** ../vim-7.3.760/src/testdir/test48.in	2010-08-15 21:57:29.000000000 +0200
--- src/testdir/test48.in	2012-12-12 18:09:21.000000000 +0100
***************
*** 54,61 ****
--- 54,65 ----
  ^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
*** ../vim-7.3.760/src/testdir/test48.ok	2010-08-15 21:57:29.000000000 +0200
--- src/testdir/test48.ok	2012-12-12 18:09:25.000000000 +0100
***************
*** 1,3 ****
--- 1,4 ----
+ , foo
  keyword keyword
  all your base 
  are belong to vim
*** ../vim-7.3.760/src/version.c	2012-12-12 17:33:26.000000000 +0100
--- src/version.c	2012-12-12 18:19:51.000000000 +0100
***************
*** 727,728 ****
--- 727,730 ----
  {   /* Add new patch number below this line */
+ /**/
+     761,
  /**/

-- 
You are not really successful until someone claims he sat
beside you in school.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///