Karsten Hopp 5d4354
To: vim_dev@googlegroups.com
Karsten Hopp 5d4354
Subject: Patch 7.3.151
Karsten Hopp 5d4354
Fcc: outbox
Karsten Hopp 5d4354
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 5d4354
Mime-Version: 1.0
Karsten Hopp 5d4354
Content-Type: text/plain; charset=UTF-8
Karsten Hopp 5d4354
Content-Transfer-Encoding: 8bit
Karsten Hopp 5d4354
------------
Karsten Hopp 5d4354
Karsten Hopp 5d4354
Patch 7.3.151 (after 7.3.074)
Karsten Hopp 5d4354
Problem:    When "unnamedplus" is in 'clipboard' the selection is sometimes
Karsten Hopp 5d4354
	    also copied to the star register.
Karsten Hopp 5d4354
Solution:   Avoid copy to the star register when undesired. (James Vega)
Karsten Hopp 5d4354
Files:	    src/ops.c
Karsten Hopp 5d4354
Karsten Hopp 5d4354
Karsten Hopp 5d4354
*** ../vim-7.3.150/src/ops.c	2010-12-08 14:23:08.000000000 +0100
Karsten Hopp 5d4354
--- src/ops.c	2011-04-01 16:23:10.000000000 +0200
Karsten Hopp 5d4354
***************
Karsten Hopp 5d4354
*** 3148,3157 ****
Karsten Hopp 5d4354
  	    /* Copy the text from register 0 to the clipboard register. */
Karsten Hopp 5d4354
  	    copy_yank_reg(&(y_regs[PLUS_REGISTER]));
Karsten Hopp 5d4354
  
Karsten Hopp 5d4354
- 	/* No need to copy to * register upon 'unnamed' now - see below */
Karsten Hopp 5d4354
  	clip_own_selection(&clip_plus);
Karsten Hopp 5d4354
  	clip_gen_set_selection(&clip_plus);
Karsten Hopp 5d4354
! 	if (!clip_isautosel() && !did_star)
Karsten Hopp 5d4354
  	{
Karsten Hopp 5d4354
  	    copy_yank_reg(&(y_regs[STAR_REGISTER]));
Karsten Hopp 5d4354
  	    clip_own_selection(&clip_star);
Karsten Hopp 5d4354
--- 3148,3156 ----
Karsten Hopp 5d4354
  	    /* Copy the text from register 0 to the clipboard register. */
Karsten Hopp 5d4354
  	    copy_yank_reg(&(y_regs[PLUS_REGISTER]));
Karsten Hopp 5d4354
  
Karsten Hopp 5d4354
  	clip_own_selection(&clip_plus);
Karsten Hopp 5d4354
  	clip_gen_set_selection(&clip_plus);
Karsten Hopp 5d4354
! 	if (!clip_isautosel() && !did_star && curr == &(y_regs[PLUS_REGISTER]))
Karsten Hopp 5d4354
  	{
Karsten Hopp 5d4354
  	    copy_yank_reg(&(y_regs[STAR_REGISTER]));
Karsten Hopp 5d4354
  	    clip_own_selection(&clip_star);
Karsten Hopp 5d4354
*** ../vim-7.3.150/src/version.c	2011-04-01 16:07:41.000000000 +0200
Karsten Hopp 5d4354
--- src/version.c	2011-04-01 16:25:40.000000000 +0200
Karsten Hopp 5d4354
***************
Karsten Hopp 5d4354
*** 716,717 ****
Karsten Hopp 5d4354
--- 716,719 ----
Karsten Hopp 5d4354
  {   /* Add new patch number below this line */
Karsten Hopp 5d4354
+ /**/
Karsten Hopp 5d4354
+     151,
Karsten Hopp 5d4354
  /**/
Karsten Hopp 5d4354
Karsten Hopp 5d4354
-- 
Karsten Hopp 5d4354
BLACK KNIGHT: I'm invincible!
Karsten Hopp 5d4354
ARTHUR:       You're a looney.
Karsten Hopp 5d4354
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
Karsten Hopp 5d4354
Karsten Hopp 5d4354
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 5d4354
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 5d4354
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
Karsten Hopp 5d4354
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///