Skip to content

Commit 3e152c7

Browse files
64-bitmanchrisbra
64-bitman
authored and
chrisbra
committed
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>
1 parent 96b2154 commit 3e152c7

12 files changed

Lines changed: 156 additions & 169 deletions

File tree

‎runtime/doc/eval.txt‎

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

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2245,8 +2245,9 @@ 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-
none The above methods are unavailable or
2249-
cannot be used.
2248+
gui GUI specific method is being used.
2249+
none Clipboard functionality is disabled or
2250+
unavailable.
22502251
See 'clipmethod' for more details.
22512252

22522253
*v:cmdarg* *cmdarg-variable*

‎runtime/doc/options.txt‎

Lines changed: 9 additions & 12 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 16
1+
*options.txt* For Vim version 9.1. Last change: 2025 Aug 18
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",
1895-
for VMS: "x11",
1896-
otherwise: "")
1894+
'clipmethod' 'cpm' string (default for Unix: "wayland,x11,gui",
1895+
for VMS: "x11,gui",
1896+
otherwise: "gui")
18971897
global
18981898
{only when the |+xterm_clipboard| or
18991899
|+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|.
19021902
methods are:
19031903
wayland Wayland selections
19041904
x11 X11 selections
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.
1905+
gui GUI specific method
19101906

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

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

19191916
*'cmdheight'* *'ch'*
19201917
'cmdheight' 'ch' number (default 1)

‎runtime/doc/version9.txt‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41608,7 +41608,8 @@ Completion~
4160841608

4160941609
Platform specific~
4161041610
-----------------
41611-
- Support for Wayland UI and support for the Wayland clipboard has been added.
41611+
- Support for Wayland UI and support for the Wayland clipboard has been added
41612+
|wayland|.
4161241613

4161341614
- Support for the XDG Desktop Specification |xdg-base-dir| has been added and
4161441615
the environment variable |$MYVIMDIR| is set to the users personal runtime
@@ -41829,6 +41830,7 @@ Options: ~
4182941830
'autocompletion' Enable auto completion |ins-autocompletion|
4183041831
'autocompletedelay' Delay in msec before menu appears after typing
4183141832
'chistory' Size of the quickfix stack |quickfix-stack|.
41833+
'clipmethod' How to access the clipboard.
4183241834
'completefuzzycollect' Enable fuzzy collection of candidates for (some)
4183341835
|ins-completion| modes
4183441836
'completeitemalign' Order of |complete-items| in Insert mode completion
@@ -41850,10 +41852,14 @@ Options: ~
4185041852
't_xo' Terminal uses XON/XOFF handshaking (e.g. vt420)
4185141853
't_CF' Support for alternate font highlighting terminal code
4185241854
'winfixbuf' Keep buffer focused in a window
41855+
'wlseat' Specify Wayland seat to use for the |wayland| feature
41856+
'wlsteal' Steal focus to access the |wayland| clipboard
41857+
'wltimeout' Specify the connection timeout for the |wayland|
41858+
compositor
4185341859

4185441860
Vim Arguments: ~
41855-
|-Y| Do not connect to the Wayland compositor.
41856-
|--clientserver| Specify backend for clientserver functionality.
41861+
|-Y| Do not connect to the |wayland| compositor.
41862+
|--clientserver| Specify backend for clientserver functionality.
4185741863

4185841864

4185941865
==============================================================================

‎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 Jun 28
1+
*wayland.txt* For Vim version 9.1. Last change: 2025 Aug 18
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 "none" when running the GUI.
25+
should equal to "gui" 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 exists.
75+
to persist selection data when a Wayland client exits.
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)