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

Patch 8.2.2562
Problem:    GUI: star register changed when 'clipboard is "unnamedplus". (Ingo
            Karkat)
Solution:   Do not change the star register when 'clipboard' contains
            "unnamedplus" and not "unnamed". (closes #1516)
Files:      src/register.c


*** ../vim-8.2.2561/src/register.c	2020-12-22 17:59:28.067057967 +0100
--- src/register.c	2021-03-02 18:59:01.238285913 +0100
***************
*** 1402,1413 ****
  
  # ifdef FEAT_X11
      // If we were yanking to the '+' register, send result to selection.
!     // Also copy to the '*' register, in case auto-select is off.
      if (clip_plus.available
  	    && (curr == &(y_regs[PLUS_REGISTER])
  		|| (!deleting && oap->regname == 0
  		  && ((clip_unnamed | clip_unnamed_saved) &
! 		      CLIP_UNNAMED_PLUS))))
      {
  	if (curr != &(y_regs[PLUS_REGISTER]))
  	    // Copy the text from register 0 to the clipboard register.
--- 1402,1414 ----
  
  # ifdef FEAT_X11
      // If we were yanking to the '+' register, send result to selection.
!     // Also copy to the '*' register, in case auto-select is off.  But not when
!     // 'clipboard' has "unnamedplus" and not "unnamed".
      if (clip_plus.available
  	    && (curr == &(y_regs[PLUS_REGISTER])
  		|| (!deleting && oap->regname == 0
  		  && ((clip_unnamed | clip_unnamed_saved) &
! 							  CLIP_UNNAMED_PLUS))))
      {
  	if (curr != &(y_regs[PLUS_REGISTER]))
  	    // Copy the text from register 0 to the clipboard register.
***************
*** 1415,1422 ****
  
  	clip_own_selection(&clip_plus);
  	clip_gen_set_selection(&clip_plus);
! 	if (!clip_isautosel_star() && !clip_isautosel_plus()
! 		&& !did_star && curr == &(y_regs[PLUS_REGISTER]))
  	{
  	    copy_yank_reg(&(y_regs[STAR_REGISTER]));
  	    clip_own_selection(&clip_star);
--- 1416,1426 ----
  
  	clip_own_selection(&clip_plus);
  	clip_gen_set_selection(&clip_plus);
! 	if (!clip_isautosel_star()
! 		&& !clip_isautosel_plus()
! 		&& !((clip_unnamed | clip_unnamed_saved) == CLIP_UNNAMED_PLUS)
! 		&& !did_star
! 		&& curr == &(y_regs[PLUS_REGISTER]))
  	{
  	    copy_yank_reg(&(y_regs[STAR_REGISTER]));
  	    clip_own_selection(&clip_star);
*** ../vim-8.2.2561/src/version.c	2021-03-02 13:36:44.249228358 +0100
--- src/version.c	2021-03-02 18:58:40.370333143 +0100
***************
*** 752,753 ****
--- 752,755 ----
  {   /* Add new patch number below this line */
+ /**/
+     2562,
  /**/

-- 
SIGIRO -- irony detected (iron core dumped)

 /// 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    ///