aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShadman <shadmansaleh3@gmail.com>2021-07-11 19:19:54 +0600
committerSean Dewar <seandewar@users.noreply.github.com>2021-09-14 13:15:39 +0100
commita9cca1b050f40521a02fc4b11a9b9cc5bb5520ff (patch)
tree5794ec62e0a53966e3912774cc2c1c9f755bc1df
parent989ccb822203213c845350e993e1ad2e6b9e3a91 (diff)
downloadrneovim-a9cca1b050f40521a02fc4b11a9b9cc5bb5520ff.tar.gz
rneovim-a9cca1b050f40521a02fc4b11a9b9cc5bb5520ff.tar.bz2
rneovim-a9cca1b050f40521a02fc4b11a9b9cc5bb5520ff.zip
backport: fixup(clipboard): Fix error not properly handled #14984
fixes #14967
-rw-r--r--runtime/autoload/provider/clipboard.vim4
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/autoload/provider/clipboard.vim b/runtime/autoload/provider/clipboard.vim
index 0687abd4dc..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