Skip to content

Commit 11c3c62

Browse files
64-bitmanchrisbra
authored andcommitted
patch 9.1.2014: clipboard: clipboard register corrupted with clipboard provider
Problem: clipboard: clipboard register corrupted with clipboard provider (Satoru Kitaguchi and mikoto2000 after v9.1.1972) Solution: Only adjust clipboard register points to the unnamed register (Foxe Chen) fixes: #18983 fixes: #18988 closes: #19000 Signed-off-by: Foxe Chen <chen.foxe@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
1 parent 90e1711 commit 11c3c62

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

runtime/doc/options.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 9.1. Last change: 2025 Dec 21
1+
*options.txt* For Vim version 9.1. Last change: 2025 Dec 23
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1823,7 +1823,7 @@ A jump table for the options with a short description can be found at |Q_op|.
18231823
prepend, e.g.: >
18241824
set clipboard^=unnamed
18251825
< When using the GUI see |'go-A'|.
1826-
When using the |clipboard-providers| feature, only the "unamed" and
1826+
When using the |clipboard-providers| feature, only the "unnamed" and
18271827
"unnamedplus" features will be recognized If compiled without the
18281828
|+clipboard| feature but compiled with the |+clipboard_provider|
18291829
feature, then they will be the only values allowed and the other

src/clipboard.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3534,7 +3534,7 @@ adjust_clip_reg(int *rp)
35343534
#ifdef FEAT_CLIPBOARD_PROVIDER
35353535
if (clipmethod == CLIPMETHOD_PROVIDER)
35363536
{
3537-
if (clip_unnamed != 0)
3537+
if (*rp == 0 && clip_unnamed != 0)
35383538
*rp = ((clip_unnamed & CLIP_UNNAMED_PLUS)) ? '+' : '*';
35393539
return;
35403540
}

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -734,6 +734,8 @@ static char *(features[]) =
734734

735735
static int included_patches[] =
736736
{ /* Add new patch number below this line */
737+
/**/
738+
2014,
737739
/**/
738740
2013,
739741
/**/

0 commit comments

Comments
 (0)