IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

clipboard: avoid redundant error message on clipboard_get failure .

Browse Source 
Fixes #2712

Helped-By: Michael Reed <m.reed@mykolab.com>
This commit is contained in:
Björn Linse 2015-06-09 22:05:52 +02:00 committed by Justin M. Keyes
parent d133502e98
commit 3fcfd52422
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/autoload/provider/clipboard.vim
View File

@ -22,14 +22,15 @@ function! s:try_cmd(cmd, ...)
let argv = split(a:cmd, " ") let argv = split(a:cmd, " ")
let out = a:0 ? systemlist(argv, a:1, 1) : systemlist(argv, [''], 1) let out = a:0 ? systemlist(argv, a:1, 1) : systemlist(argv, [''], 1)
if v:shell_error if v:shell_error
echohl WarningMsg
echo "clipboard: error: ".(len(out) ? out[0] : '') echo "clipboard: error: ".(len(out) ? out[0] : '')
return '' echohl None
return 0
endif endif
return out return out
endfunction endfunction
let s:cache_enabled = 1 let s:cache_enabled = 1
if executable('pbcopy') if executable('pbcopy')
let s:copy['+'] = 'pbcopy' let s:copy['+'] = 'pbcopy'
let s:paste['+'] = 'pbpaste' let s:paste['+'] = 'pbpaste'
@ -47,7 +48,7 @@ elseif executable('xsel')
let s:copy['*'] = 'xsel --nodetach -i -p' let s:copy['*'] = 'xsel --nodetach -i -p'
let s:paste['*'] = 'xsel -o -p' let s:paste['*'] = 'xsel -o -p'
else else
echom 'clipboard: No shell command for communicating with the clipboard found.' echom 'clipboard: No clipboard tool available. See :help nvim-clipboard'
finish finish
endif endif

11
src/nvim/ops.c
View File

@ -5291,6 +5291,9 @@ static yankreg_T *adjust_clipboard_name(int *name, bool quiet)
static bool get_clipboard(int name, yankreg_T **target, bool quiet) static bool get_clipboard(int name, yankreg_T **target, bool quiet)
{ {
// show message on error
bool errmsg = true;
yankreg_T *reg = adjust_clipboard_name(&name, quiet); yankreg_T *reg = adjust_clipboard_name(&name, quiet);
if (reg == NULL) { if (reg == NULL) {
return false; return false;
@ -5304,6 +5307,10 @@ static bool get_clipboard(int name, yankreg_T **target, bool quiet)
typval_T result = eval_call_provider("clipboard", "get", args); typval_T result = eval_call_provider("clipboard", "get", args);
if (result.v_type != VAR_LIST) { if (result.v_type != VAR_LIST) {
if (result.v_type == VAR_NUMBER && result.vval.v_number == 0) {
// failure has already been indicated by provider
errmsg = false;
}
goto err; goto err;
} }
@ -5389,7 +5396,9 @@ err:
} }
reg->y_array = NULL; reg->y_array = NULL;
reg->y_size = 0; reg->y_size = 0;
EMSG("clipboard: provider returned invalid data"); if (errmsg) {
EMSG("clipboard: provider returned invalid data");
}
*target = reg; *target = reg;
return false; return false;
} }