Remove unnamedplus' from clipboard in addition to unnamed'

Vim 7.3.074 adds the `unnamedplus' feature to the clipboard option,
which allows use of the "+ register (X11 CLIPBOARD) via yank/paste
This commit is contained in:
guns 2011-01-23 10:41:55 +08:00 committed by Tim Pope
parent 193649616c
commit d9e6bfdd90

View File

@ -335,7 +335,7 @@ function! s:insert(...) " {{{1
endif endif
"call inputsave() "call inputsave()
let cb_save = &clipboard let cb_save = &clipboard
set clipboard-=unnamed set clipboard-=unnamed clipboard-=unnamedplus
let reg_save = @@ let reg_save = @@
call setreg('"',"\r",'v') call setreg('"',"\r",'v')
call s:wrapreg('"',char,linemode) call s:wrapreg('"',char,linemode)
@ -400,7 +400,7 @@ function! s:dosurround(...) " {{{1
endif endif
endif endif
let cb_save = &clipboard let cb_save = &clipboard
set clipboard-=unnamed set clipboard-=unnamed clipboard-=unnamedplus
let append = "" let append = ""
let original = getreg('"') let original = getreg('"')
let otype = getregtype('"') let otype = getregtype('"')
@ -499,7 +499,7 @@ function! s:opfunc(type,...) " {{{1
let sel_save = &selection let sel_save = &selection
let &selection = "inclusive" let &selection = "inclusive"
let cb_save = &clipboard let cb_save = &clipboard
set clipboard-=unnamed set clipboard-=unnamed clipboard-=unnamedplus
let reg_save = getreg(reg) let reg_save = getreg(reg)
let reg_type = getregtype(reg) let reg_type = getregtype(reg)
"call setreg(reg,"\n","c") "call setreg(reg,"\n","c")