diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/autoload/provider/clipboard.vim | 12 | ||||
| -rw-r--r-- | runtime/doc/deprecated.txt | 1 | ||||
| -rw-r--r-- | runtime/doc/eval.txt | 16 | ||||
| -rw-r--r-- | runtime/doc/provider.txt | 5 | ||||
| -rw-r--r-- | runtime/doc/various.txt | 11 |
5 files changed, 13 insertions, 32 deletions
diff --git a/runtime/autoload/provider/clipboard.vim b/runtime/autoload/provider/clipboard.vim index 0c65198d78..0ddfdf7e49 100644 --- a/runtime/autoload/provider/clipboard.vim +++ b/runtime/autoload/provider/clipboard.vim @@ -77,18 +77,18 @@ function! provider#clipboard#Executable() abort let s:copy['*'] = 'wl-copy --foreground --primary' let s:paste['*'] = 'wl-paste --no-newline --primary' return 'wl-copy' - elseif exists('$DISPLAY') && executable('xsel') && s:cmd_ok('xsel -o -b') - let s:copy['+'] = 'xsel --nodetach -i -b' - let s:paste['+'] = 'xsel -o -b' - let s:copy['*'] = 'xsel --nodetach -i -p' - let s:paste['*'] = 'xsel -o -p' - return 'xsel' elseif exists('$DISPLAY') && executable('xclip') let s:copy['+'] = 'xclip -quiet -i -selection clipboard' let s:paste['+'] = 'xclip -o -selection clipboard' let s:copy['*'] = 'xclip -quiet -i -selection primary' let s:paste['*'] = 'xclip -o -selection primary' return 'xclip' + elseif exists('$DISPLAY') && executable('xsel') && s:cmd_ok('xsel -o -b') + let s:copy['+'] = 'xsel --nodetach -i -b' + let s:paste['+'] = 'xsel -o -b' + let s:copy['*'] = 'xsel --nodetach -i -p' + let s:paste['*'] = 'xsel -o -p' + return 'xsel' elseif executable('lemonade') let s:copy['+'] = 'lemonade copy' let s:paste['+'] = 'lemonade paste' diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt index 92a6bd6b4f..4369ad7894 100644 --- a/runtime/doc/deprecated.txt +++ b/runtime/doc/deprecated.txt @@ -37,6 +37,7 @@ Functions ~ *file_readable()* Obsolete name for |filereadable()|. *highlight_exists()* Obsolete name for |hlexists()|. *highlightID()* Obsolete name for |hlID()|. +*inputdialog()* Use |input()| instead. *jobclose()* Obsolete name for |chanclose()| *jobsend()* Obsolete name for |chansend()| *last_buffer_nr()* Obsolete name for bufnr("$"). diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 91986a9442..9bd73df7fe 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -2137,8 +2137,6 @@ index({list}, {expr} [, {start} [, {ic}]]) Number index in {list} where {expr} appears input({prompt} [, {text} [, {completion}]]) String get input from the user -inputdialog({prompt} [, {text} [, {completion}]]) - String like input() but in a GUI dialog inputlist({textlist}) Number let the user pick from a choice list inputrestore() Number restore typeahead inputsave() Number save and clear typeahead @@ -4915,20 +4913,6 @@ input({opts}) : call inputrestore() :endfunction -inputdialog({prompt} [, {text} [, {cancelreturn}]]) *inputdialog()* -inputdialog({opts}) - Like |input()|, but when the GUI is running and text dialogs - are supported, a dialog window pops up to input the text. - Example: > - :let n = inputdialog("value for shiftwidth", shiftwidth()) - :if n != "" - : let &sw = n - :endif -< When the dialog is cancelled {cancelreturn} is returned. When - omitted an empty string is returned. - Hitting <Enter> works like pressing the OK button. Hitting - <Esc> works like pressing the Cancel button. - inputlist({textlist}) *inputlist()* {textlist} must be a |List| of strings. This |List| is displayed, one string per line. The user will be prompted to diff --git a/runtime/doc/provider.txt b/runtime/doc/provider.txt index 058e0546cd..4de411a60e 100644 --- a/runtime/doc/provider.txt +++ b/runtime/doc/provider.txt @@ -150,9 +150,10 @@ The presence of a working clipboard tool implicitly enables the '+' and '*' registers. Nvim looks for these clipboard tools, in order of priority: - |g:clipboard| - - pbcopy/pbpaste (macOS) - - xsel (if $DISPLAY is set) + - pbcopy, pbpaste (macOS) + - wl-copy, wl-paste (if $WAYLAND_DISPLAY is set) - xclip (if $DISPLAY is set) + - xsel (if $DISPLAY is set) - lemonade (for SSH) https://github.com/pocke/lemonade - doitclient (for SSH) http://www.chiark.greenend.org.uk/~sgtatham/doit/ - win32yank (Windows) diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index 5f40ccf2ec..d78dd90f18 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -517,14 +517,9 @@ m *+xim* X input method |xim| :silent! /^begin :if v:errmsg != "" : ... pattern was not found -< ":silent" will also avoid the hit-enter prompt. When - using this for an external command, this may cause the - screen to be messed up. Use |CTRL-L| to clean it up - then. - ":silent menu ..." defines a menu that will not echo a - Command-line command. The command will still produce - messages though. Use ":silent" in the command itself - to avoid that: ":silent menu .... :silent command". +< ":silent" also skips the hit-enter prompt. + Dialogs that prompt for user input (|confirm()|, + 'swapfile', …) are never silent. *:uns* *:unsilent* :uns[ilent] {command} Execute {command} not silently. Only makes a |