aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--runtime/autoload/provider/clipboard.vim5
-rw-r--r--runtime/doc/nvim_clipboard.txt2
-rw-r--r--src/nvim/eval.c2
-rw-r--r--test/functional/viml/completion_spec.lua1
4 files changed, 9 insertions, 1 deletions
diff --git a/runtime/autoload/provider/clipboard.vim b/runtime/autoload/provider/clipboard.vim
index 5ea9df92fe..9f1737639b 100644
--- a/runtime/autoload/provider/clipboard.vim
+++ b/runtime/autoload/provider/clipboard.vim
@@ -47,6 +47,11 @@ elseif exists('$DISPLAY') && executable('xclip')
let s:paste['+'] = 'xclip -o -selection clipboard'
let s:copy['*'] = 'xclip -quiet -i -selection primary'
let s:paste['*'] = 'xclip -o -selection primary'
+elseif executable('lemonade')
+ let s:copy['+'] = 'lemonade copy'
+ let s:paste['+'] = 'lemonade paste'
+ let s:copy['*'] = 'lemonade copy'
+ let s:paste['*'] = 'lemonade paste'
else
echom 'clipboard: No clipboard tool available. See :help nvim-clipboard'
finish
diff --git a/runtime/doc/nvim_clipboard.txt b/runtime/doc/nvim_clipboard.txt
index 1183ad7a3c..258fc550f8 100644
--- a/runtime/doc/nvim_clipboard.txt
+++ b/runtime/doc/nvim_clipboard.txt
@@ -22,6 +22,8 @@ is found in your `$PATH`.
- xclip
- xsel (newer alternative to xclip)
- pbcopy/pbpaste (only for Mac OS X)
+- lemonade (useful for SSH machine)
+ https://github.com/pocke/lemonade
The presence of a suitable clipboard tool implicitly enables the '+' and '*'
registers.
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 5477e79cad..51ef777095 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -22320,7 +22320,7 @@ static void on_process_exit(Process *proc, int status, void *d)
TerminalJobData *data = d;
if (data->term && !data->exited) {
data->exited = true;
- char msg[22];
+ char msg[sizeof("\r\n[Process exited ]") + NUMBUFLEN];
snprintf(msg, sizeof msg, "\r\n[Process exited %d]", proc->status);
terminal_close(data->term, msg);
}
diff --git a/test/functional/viml/completion_spec.lua b/test/functional/viml/completion_spec.lua
index 01b2bad059..8b507c8ffc 100644
--- a/test/functional/viml/completion_spec.lua
+++ b/test/functional/viml/completion_spec.lua
@@ -172,6 +172,7 @@ describe('completion', function()
[4] = {bold = true, foreground = Screen.colors.SeaGreen},
})
+ execute("set complete=.")
feed('ifoobar fooegg<cr>f<c-p>')
screen:expect([[
foobar fooegg |