From 172f619b9a834dd431f67ec46a7b4f90b4c2af52 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Wed, 23 Dec 2020 22:06:03 -0500 Subject: vim-patch:8.1.1837: popup test fails if clipboard is supported but not working Problem: Popup test fails if clipboard is supported but not working. Solution: Add the "clipboard_working" feature. Also use Check commands instead of "if" and "throw". And remove stray ch_logfile(). https://github.com/vim/vim/commit/4999a7fb6585915b53888c930067b33c01674678 Treat "clipboard_working" feature as an alias to "clipboard" feature. N/A patches for version.c: vim-patch:8.1.1840: Testing: WorkingClipboard() is not accurate Problem: Testing: WorkingClipboard() is not accurate. Solution: Check feature clipboard_working instead. https://github.com/vim/vim/commit/52992feafe8a996fbce29b97ae135abc169aa716 Neovim did not port WorkingClipboard() for the legacy tests. --- src/nvim/eval/funcs.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/nvim/eval/funcs.c') diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 89d9a85775..ed01e8a8b0 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -4206,6 +4206,8 @@ static void f_has(typval_T *argvars, typval_T *rettv, FunPtr fptr) n = true; } else if (STRICMP(name, "syntax_items") == 0) { n = syntax_present(curwin); + } else if (STRICMP(name, "clipboard_working") == 0) { + n = eval_has_provider("clipboard"); #ifdef UNIX } else if (STRICMP(name, "unnamedplus") == 0) { n = eval_has_provider("clipboard"); -- cgit