Skip to content

Commit 17b4c7c

Browse files
committed
patch 9.1.1656: MS-Windows: Patch v9.1.1652 breaks clipboard
Problem: MS-Windows: Patch v9.1.1652 breaks clipboard (ddad431, after v9.1.1652) Solution: Revert the patch Revert "patch 9.1.1652: cannot determine non-X11/Wayland clipmethods" This reverts commit 3e152c7. fixes: #18064 Signed-off-by: Christian Brabandt <cb@256bit.org>
1 parent 3e44fbf commit 17b4c7c

File tree

11 files changed

+168
-145
lines changed

11 files changed

+168
-145
lines changed

runtime/doc/eval.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 9.1. Last change: 2025 Aug 18
1+
*eval.txt* For Vim version 9.1. Last change: 2025 Aug 20
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2245,9 +2245,8 @@ v:clipmethod The current method of accessing the clipboard that is being
22452245
used. Can either have the value of:
22462246
wayland The Wayland protocol is being used.
22472247
x11 X11 selections are being used.
2248-
gui GUI specific method is being used.
2249-
none Clipboard functionality is disabled or
2250-
unavailable.
2248+
none The above methods are unavailable or
2249+
cannot be used.
22512250
See 'clipmethod' for more details.
22522251

22532252
*v:cmdarg* *cmdarg-variable*

runtime/doc/options.txt

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 9.1. Last change: 2025 Aug 18
1+
*options.txt* For Vim version 9.1. Last change: 2025 Aug 20
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1891,9 +1891,9 @@ A jump table for the options with a short description can be found at |Q_op|.
18911891
{pattern}, this must be the last entry.
18921892

18931893
*'clipmethod'* *'cpm'*
1894-
'clipmethod' 'cpm' string (default for Unix: "wayland,x11,gui",
1895-
for VMS: "x11,gui",
1896-
otherwise: "gui")
1894+
'clipmethod' 'cpm' string (default for Unix: "wayland,x11",
1895+
for VMS: "x11",
1896+
otherwise: "")
18971897
global
18981898
{only when the |+xterm_clipboard| or
18991899
|+wayland_clipboard| features are included}
@@ -1902,16 +1902,19 @@ A jump table for the options with a short description can be found at |Q_op|.
19021902
methods are:
19031903
wayland Wayland selections
19041904
x11 X11 selections
1905-
gui GUI specific method
1905+
1906+
Note: This option is ignored when either the GUI is running or if Vim
1907+
is run on a system without Wayland or X11 support, such as Windows or
1908+
macOS. The GUI or system way of accessing the clipboard is always
1909+
used instead.
19061910

19071911
The option value is a list of comma separated items. The list is
19081912
parsed left to right in order, and the first method that Vim
19091913
determines is available or is working is used as the actual method for
1910-
accessing the clipboard. Setting this option to an empty value
1911-
disables the clipboard functionality on all systems.
1914+
accessing the clipboard.
19121915

1913-
The current method that is being used can be found in the
1914-
|v:clipmethod| variable.
1916+
The current method that is being used can be found in the |v:clipmethod|
1917+
variable.
19151918

19161919
*'cmdheight'* *'ch'*
19171920
'cmdheight' 'ch' number (default 1)

runtime/doc/wayland.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*wayland.txt* For Vim version 9.1. Last change: 2025 Aug 18
1+
*wayland.txt* For Vim version 9.1. Last change: 2025 Aug 20
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -22,7 +22,7 @@ multiple Wayland seats in the same Wayland session.
2222
See |gui-wayland|. Please note that when using the GUI, Vim uses the toolkit
2323
such as GTK for accessing the clipboard, and does not access the clipboard
2424
though Wayland. You can check this though the |v:clipmethod| variable, which
25-
should equal to "gui" when running the GUI.
25+
should equal to "none" when running the GUI.
2626

2727
Wayland commands:
2828
*:wlrestore* *:wl*
@@ -72,7 +72,7 @@ selections, see |wayland-primary-selection| for more details.
7272
*wayland-persist*
7373
If you use X11 cut buffers, no such things exist on Wayland. Instead to
7474
emulate such functionality, a separate clipboard manager must be used in order
75-
to persist selection data when a Wayland client exits.
75+
to persist selection data when a Wayland client exists.
7676

7777
*wayland-and-x11*
7878
If your version of Vim comes compiled with both X11 and Wayland support, then

0 commit comments

Comments
 (0)