From 2495e7e22a0d56911d3677a17de3ff946b68a9a1 Mon Sep 17 00:00:00 2001
From: wzy <32936898+Freed-Wu@users.noreply.github.com>
Date: Tue, 3 Dec 2024 21:06:54 +0800
Subject: fix(clipboard): tmux clipboard depends on $TMUX #31268

Problem:
tmux clipboard not used when tmux is a daemon and $TMUX is empty.

Solution:
If `tmux list-buffers` succeeds, use tmux clipboard.
---
 runtime/autoload/provider/clipboard.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime/autoload/provider')

diff --git a/runtime/autoload/provider/clipboard.vim b/runtime/autoload/provider/clipboard.vim
index 58d3d4550f..848fa401f1 100644
--- a/runtime/autoload/provider/clipboard.vim
+++ b/runtime/autoload/provider/clipboard.vim
@@ -158,7 +158,7 @@ function! provider#clipboard#Executable() abort
     let s:copy['*'] = s:copy['+']
     let s:paste['*'] = s:paste['+']
     return 'termux-clipboard'
-  elseif !empty($TMUX) && executable('tmux')
+  elseif executable('tmux') && (!empty($TMUX) || 0 == jobwait([jobstart(['tmux', 'list-buffers'])], 2000)[0])
     let tmux_v = v:lua.vim.version.parse(system(['tmux', '-V']))
     if !empty(tmux_v) && !v:lua.vim.version.lt(tmux_v, [3,2,0])
       let s:copy['+'] = ['tmux', 'load-buffer', '-w', '-']
-- 
cgit 


From a389dc2f950ef89492dfc2d8334e421d2252cddf Mon Sep 17 00:00:00 2001
From: Gregory Anders <greg@gpanders.com>
Date: Tue, 31 Dec 2024 09:59:03 -0600
Subject: feat(clipboard)!: use OSC 52 as fallback clipboard provider (#31730)

We currently enable the OSC 52 clipboard provider by setting g:clipboard
when a list of conditions are met, one of which is that $SSH_TTY must be
set. We include this condition because often OSC 52 is not the best
clipboard provider, so if there are "local" providers available Nvim
should prefer those over OSC 52.

However, if no other providers are available, Nvim should use OSC 52
even when $SSH_TTY is not set. When a user is in an SSH session then the
checks for the other clipboard providers will still (typically) fail, so
OSC 52 continues to be enabled by default in SSH sessions.

This is marked as a breaking change because there are some cases where
OSC 52 wasn't enabled before and is now (or vice versa).
---
 runtime/autoload/provider/clipboard.vim | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'runtime/autoload/provider')

diff --git a/runtime/autoload/provider/clipboard.vim b/runtime/autoload/provider/clipboard.vim
index 848fa401f1..0bfd82f61d 100644
--- a/runtime/autoload/provider/clipboard.vim
+++ b/runtime/autoload/provider/clipboard.vim
@@ -169,6 +169,14 @@ function! provider#clipboard#Executable() abort
     let s:copy['*'] = s:copy['+']
     let s:paste['*'] = s:paste['+']
     return 'tmux'
+  elseif get(get(g:, 'termfeatures', {}), 'osc52') && &clipboard ==# ''
+    " Don't use OSC 52 when 'clipboard' is set. It can be slow and cause a lot
+    " of user prompts. Users can opt-in to it by setting g:clipboard manually.
+    let s:copy['+'] = v:lua.require'vim.ui.clipboard.osc52'.copy('+')
+    let s:copy['*'] = v:lua.require'vim.ui.clipboard.osc52'.copy('*')
+    let s:paste['+'] = v:lua.require'vim.ui.clipboard.osc52'.paste('+')
+    let s:paste['*'] = v:lua.require'vim.ui.clipboard.osc52'.paste('*')
+    return 'OSC 52'
   endif
 
   let s:err = 'clipboard: No clipboard tool. :help clipboard'
-- 
cgit