mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-03-24 17:40:59 +00: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
Download Patch File Download Diff File Expand all files Collapse all files

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)
{
// show message on error
bool errmsg = true;
yankreg_T *reg = adjust_clipboard_name(&name, quiet);
if (reg == NULL) {
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);
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;
}
@@ -5389,7 +5396,9 @@ err:
}
reg->y_array = NULL;
reg->y_size = 0;
EMSG("clipboard: provider returned invalid data");
if (errmsg) {
EMSG("clipboard: provider returned invalid data");
}
*target = reg;
return false;
}