provider/clipboard.vim: Handle missing g:clipboard keys

1 files changed, 26 insertions, 26 deletions

diff --git a/runtime/doc/provider.txt b/runtime/doc/provider.txt
index 113f4a478e..50307ccbf3 100644
--- a/runtime/doc/provider.txt
+++ b/runtime/doc/provider.txt
@@ -116,48 +116,48 @@ To use the RVM "system" Ruby installation: >
 ==============================================================================
 Clipboard integration 			      *provider-clipboard* *clipboard*
 
-Nvim has no direct connection to the system clipboard. Instead it is
-accessible through a |provider| which transparently uses shell commands for
-communicating with the clipboard.
+Nvim has no direct connection to the system clipboard. Instead it depends on
+a |provider| which transparently uses shell commands to communicate with the
+system clipboard or any other clipboard "backend".
 
-Clipboard access is implicitly enabled if any of the following clipboard tools
-are found in your `$PATH`.
+To ALWAYS use the clipboard for ALL operations (instead of interacting with
+the '+' and/or '*' registers explicitly): >
 
+    set clipboard+=unnamedplus
+<
+See 'clipboard' for details and options.
+
+							      *clipboard-tool*
+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)
   - xclip
   - xsel (newer alternative to xclip)
-  - pbcopy/pbpaste (macOS)
   - lemonade (for SSH) https://github.com/pocke/lemonade
   - doitclient (for SSH) http://www.chiark.greenend.org.uk/~sgtatham/doit/
+  - win32yank (Windows)
+  - tmux (if $TMUX is set)
 
-If you would like to configure the provider: >
+								 *g:clipboard*
+To configure a custom clipboard tool, set `g:clipboard` to a dictionary: >
     let g:clipboard = {
           \   'name': 'myClipboard',
           \   'copy': {
-          \      '+': 'copyCommand',
-          \      '*': 'copyCommand',
+          \      '+': 'tmux load-buffer -',
+          \      '*': 'tmux load-buffer -',
           \    },
           \   'paste': {
-          \      '+': 'pasteCommand',
-          \      '*': 'pasteCommand',
+          \      '+': 'tmux save-buffer -',
+          \      '*': 'tmux save-buffer -',
           \   },
           \   'cache_enabled': 1,
           \ }
 
-If the cache is enabled, then when a selection is copied and the copy command
-is executed, neovim will cache this selection until the copy command process
-dies. Then, when pasting, if the copy command process has not died, the cached
-selection is returned instead of executing the paste command.
-
-The presence of a suitable clipboard tool implicitly enables the '+' and '*'
-registers.
-
-If you want to ALWAYS use the clipboard for ALL operations (as opposed
-to interacting with the '+' and/or '*' registers explicitly), set the
-following option:
->
-    set clipboard+=unnamedplus
-<
-See 'clipboard' for details and more options.
+If `cache_enabled` is |TRUE| then when a selection is copied, Nvim will cache
+the selection until the copy command process dies. When pasting, if the copy
+process has not died, the cached selection is applied.
 
 ==============================================================================
 X11 selection mechanism			      *clipboard-x11* *x11-selection*