Merge pull request #5042 from bfredl/unnamedunnamedplus

clipboard: make v:register=='+' when clipboard=unnamed,unnamedplus

2 files changed, 4 insertions, 3 deletions

diff --git a/test/functional/clipboard/clipboard_provider_spec.lua b/test/functional/clipboard/clipboard_provider_spec.lua
index b4febe4bfb..15977b9777 100644
--- a/test/functional/clipboard/clipboard_provider_spec.lua
+++ b/test/functional/clipboard/clipboard_provider_spec.lua
@@ -308,6 +308,7 @@ describe('clipboard usage', function()
     end)
 
     it('links the "+ and unnamed registers', function()
+      eq('+', eval('v:register'))
       insert("one two")
       feed('^"+dwdw"+P')
       expect('two')
@@ -335,6 +336,7 @@ describe('clipboard usage', function()
       eq({{'really unnamed', ''}, 'V'}, eval("g:test_clip['*']"))
 
       -- unnamedplus takes predecence when pasting
+      eq('+', eval('v:register'))
       execute("let g:test_clip['+'] = ['the plus','']")
       execute("let g:test_clip['*'] = ['the star','']")
       feed("p")
diff --git a/test/functional/fixtures/autoload/provider/clipboard.vim b/test/functional/fixtures/autoload/provider/clipboard.vim
index 0935ea45ff..411e095c71 100644
--- a/test/functional/fixtures/autoload/provider/clipboard.vim
+++ b/test/functional/fixtures/autoload/provider/clipboard.vim
@@ -9,13 +9,12 @@ function! s:methods.get(reg)
   if g:cliperror
     return 0
   end
-  let reg = a:reg == '"' ? '+' : a:reg
   if g:cliplossy
     " behave like pure text clipboard
-    return g:test_clip[reg][0]
+    return g:test_clip[a:reg][0]
   else
     " behave like VIMENC clipboard
-    return g:test_clip[reg]
+    return g:test_clip[a:reg]
   end
 endfunction