adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.1656: MS-Windows: Patch v9.1.1652 breaks clipboard

Browse Source 
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 3e152c76ad.

fixes: #18064

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt
2025-08-20 21:07:07 +02:00
parent 3e44fbf316
commit 17b4c7cfa2
11 changed files with 170 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/doc/eval.txt
View File

@ -1,4 +1,4 @@
*eval.txt* For Vim version 9.1. Last change: 2025 Aug 18
*eval.txt* For Vim version 9.1. Last change: 2025 Aug 20
VIM REFERENCE MANUAL by Bram Moolenaar
@ -2245,9 +2245,8 @@ v:clipmethod The current method of accessing the clipboard that is being
used. Can either have the value of:
wayland The Wayland protocol is being used.
x11 X11 selections are being used.
gui GUI specific method is being used.
none Clipboard functionality is disabled or
unavailable.
none The above methods are unavailable or
cannot be used.
See 'clipmethod' for more details.
*v:cmdarg* *cmdarg-variable*

21
runtime/doc/options.txt
View File

@ -1,4 +1,4 @@
*options.txt* For Vim version 9.1. Last change: 2025 Aug 18
*options.txt* For Vim version 9.1. Last change: 2025 Aug 20
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|.
{pattern}, this must be the last entry.
*'clipmethod'* *'cpm'*
'clipmethod' 'cpm' string (default for Unix: "wayland,x11,gui",
for VMS: "x11,gui",
otherwise: "gui")
'clipmethod' 'cpm' string (default for Unix: "wayland,x11",
for VMS: "x11",
otherwise: "")
global
{only when the |+xterm_clipboard| or
|+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|.
methods are:
wayland Wayland selections
x11 X11 selections
gui GUI specific method
Note: This option is ignored when either the GUI is running or if Vim
is run on a system without Wayland or X11 support, such as Windows or
macOS. The GUI or system way of accessing the clipboard is always
used instead.
The option value is a list of comma separated items. The list is
parsed left to right in order, and the first method that Vim
determines is available or is working is used as the actual method for
accessing the clipboard. Setting this option to an empty value
disables the clipboard functionality on all systems.
accessing the clipboard.
The current method that is being used can be found in the
|v:clipmethod| variable.
The current method that is being used can be found in the |v:clipmethod|
variable.
*'cmdheight'* *'ch'*
'cmdheight' 'ch' number (default 1)

6
runtime/doc/wayland.txt
View File

@ -1,4 +1,4 @@
*wayland.txt* For Vim version 9.1. Last change: 2025 Aug 18
*wayland.txt* For Vim version 9.1. Last change: 2025 Aug 20
VIM REFERENCE MANUAL by Bram Moolenaar
@ -22,7 +22,7 @@ multiple Wayland seats in the same Wayland session.
See |gui-wayland|. Please note that when using the GUI, Vim uses the toolkit
such as GTK for accessing the clipboard, and does not access the clipboard
though Wayland. You can check this though the |v:clipmethod| variable, which
should equal to "gui" when running the GUI.
should equal to "none" when running the GUI.
Wayland commands:
*:wlrestore* *:wl*
@ -72,7 +72,7 @@ selections, see |wayland-primary-selection| for more details.
*wayland-persist*
If you use X11 cut buffers, no such things exist on Wayland. Instead to
emulate such functionality, a separate clipboard manager must be used in order
to persist selection data when a Wayland client exits.
to persist selection data when a Wayland client exists.
*wayland-and-x11*
If your version of Vim comes compiled with both X11 and Wayland support, then