patch 9.1.1652: cannot determine non-X11/Wayland clipmethods

Problem:  Cannot determine non-X11/Wayland clipmethods
Solution: Add the "gui" value to the 'clipmethod' option (Foxe Chen)

closes: #18006

Signed-off-by: Foxe Chen <chen.foxe@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Foxe Chen
2025-08-18 22:09:27 +02:00
committed by Christian Brabandt
parent 96b2154b73
commit 3e152c76ad
12 changed files with 169 additions and 182 deletions

View File

@ -1,4 +1,4 @@
*eval.txt* For Vim version 9.1. Last change: 2025 Jul 22
*eval.txt* For Vim version 9.1. Last change: 2025 Aug 18
VIM REFERENCE MANUAL by Bram Moolenaar
@ -2245,8 +2245,9 @@ 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.
none The above methods are unavailable or
cannot be used.
gui GUI specific method is being used.
none Clipboard functionality is disabled or
unavailable.
See 'clipmethod' for more details.
*v:cmdarg* *cmdarg-variable*

View File

@ -1,4 +1,4 @@
*options.txt* For Vim version 9.1. Last change: 2025 Aug 16
*options.txt* For Vim version 9.1. Last change: 2025 Aug 18
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",
for VMS: "x11",
otherwise: "")
'clipmethod' 'cpm' string (default for Unix: "wayland,x11,gui",
for VMS: "x11,gui",
otherwise: "gui")
global
{only when the |+xterm_clipboard| or
|+wayland_clipboard| features are included}
@ -1902,19 +1902,16 @@ A jump table for the options with a short description can be found at |Q_op|.
methods are:
wayland Wayland selections
x11 X11 selections
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.
gui GUI specific method
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.
accessing the clipboard. Setting this option to an empty value
disables the clipboard functionality on all systems.
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)

View File

@ -41608,7 +41608,8 @@ Completion~
Platform specific~
-----------------
- Support for Wayland UI and support for the Wayland clipboard has been added.
- Support for Wayland UI and support for the Wayland clipboard has been added
|wayland|.
- Support for the XDG Desktop Specification |xdg-base-dir| has been added and
the environment variable |$MYVIMDIR| is set to the users personal runtime
@ -41829,6 +41830,7 @@ Options: ~
'autocompletion' Enable auto completion |ins-autocompletion|
'autocompletedelay' Delay in msec before menu appears after typing
'chistory' Size of the quickfix stack |quickfix-stack|.
'clipmethod' How to access the clipboard.
'completefuzzycollect' Enable fuzzy collection of candidates for (some)
|ins-completion| modes
'completeitemalign' Order of |complete-items| in Insert mode completion
@ -41850,10 +41852,14 @@ Options: ~
't_xo' Terminal uses XON/XOFF handshaking (e.g. vt420)
't_CF' Support for alternate font highlighting terminal code
'winfixbuf' Keep buffer focused in a window
'wlseat' Specify Wayland seat to use for the |wayland| feature
'wlsteal' Steal focus to access the |wayland| clipboard
'wltimeout' Specify the connection timeout for the |wayland|
compositor
Vim Arguments: ~
|-Y| Do not connect to the Wayland compositor.
|--clientserver| Specify backend for clientserver functionality.
|-Y| Do not connect to the |wayland| compositor.
|--clientserver| Specify backend for clientserver functionality.
==============================================================================

View File

@ -1,4 +1,4 @@
*wayland.txt* For Vim version 9.1. Last change: 2025 Jun 28
*wayland.txt* For Vim version 9.1. Last change: 2025 Aug 18
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 "none" when running the GUI.
should equal to "gui" 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 exists.
to persist selection data when a Wayland client exits.
*wayland-and-x11*
If your version of Vim comes compiled with both X11 and Wayland support, then