diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2021-09-14 07:02:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-14 07:02:06 -0700 |
| commit | 5a813160ae07570f9002bc55777f671f734fc2a4 (patch) | |
| tree | b6baa265634f92b138f2c275ddc1b579b1c59abd /runtime/autoload | |
| parent | 88336851ee1e9c3982195592ae2fc145ecfd3369 (diff) | |
| parent | 917f30666657acc3ad3daf44425c4d28f7ffb299 (diff) | |
| download | rneovim-5a813160ae07570f9002bc55777f671f734fc2a4.tar.gz rneovim-5a813160ae07570f9002bc55777f671f734fc2a4.tar.bz2 rneovim-5a813160ae07570f9002bc55777f671f734fc2a4.zip | |
Merge #15664 backport PRs
backport: PRs #14962, #14982, #14984, #14989, #15011, #15043
Diffstat (limited to 'runtime/autoload')
| -rw-r--r-- | runtime/autoload/provider/clipboard.vim | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/autoload/provider/clipboard.vim b/runtime/autoload/provider/clipboard.vim index dea79f21f0..991bed6bbd 100644 --- a/runtime/autoload/provider/clipboard.vim +++ b/runtime/autoload/provider/clipboard.vim @@ -158,7 +158,9 @@ function! s:clipboard.get(reg) abort end let clipboard_data = s:try_cmd(s:paste[a:reg]) - if match(&clipboard, '\v(unnamed|unnamedplus)') >= 0 && get(s:selections[a:reg].data, 0, []) == clipboard_data + if match(&clipboard, '\v(unnamed|unnamedplus)') >= 0 + \ && type(clipboard_data) == v:t_list + \ && get(s:selections[a:reg].data, 0, []) ==# clipboard_data " When system clipboard return is same as our cache return the cache " as it contains regtype information return s:selections[a:reg].data |