aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2015-08-09 21:04:43 -0400
committerJustin M. Keyes <justinkz@gmail.com>2015-08-09 21:04:43 -0400
commitef6451a11329c2e60764e9e17fadcec4e82f08f3 (patch)
tree8e5eab3a5b79f0811bcfb261fdda2d771533ab41 /runtime/doc
parent5a195858657e1c494e77ea868073d2f3664cdb60 (diff)
parent41e9ebcf41d6cba830254ffa9e089df21b22acf8 (diff)
downloadrneovim-ef6451a11329c2e60764e9e17fadcec4e82f08f3.tar.gz
rneovim-ef6451a11329c2e60764e9e17fadcec4e82f08f3.tar.bz2
rneovim-ef6451a11329c2e60764e9e17fadcec4e82f08f3.zip
Merge #3141 'handle clipboard=unnamedplus,unnamed correctly'.
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/options.txt33
1 files changed, 2 insertions, 31 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index fea8a59a74..a79903b358 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1402,8 +1402,8 @@ A jump table for the options with a short description can be found at |Q_op|.
register '*' for all yank, delete, change and put
operations which would normally go to the unnamed
register. When "unnamed" is also included to the
- option, yank operations (but not delete, change or
- put) will additionally copy the text into register
+ option, yank and delete operations (but not put)
+ will additionally copy the text into register
'*'. See |nvim-clipboard|.
<
*clipboard-autoselect*
@@ -1427,35 +1427,6 @@ A jump table for the options with a short description can be found at |Q_op|.
autoselectml Like "autoselect", but for the modeless selection
only. Compare to the 'A' flag in 'guioptions'.
- *clipboard-html*
- html When the clipboard contains HTML, use this when
- pasting. When putting text on the clipboard, mark it
- as HTML. This works to copy rendered HTML from
- Firefox, paste it as raw HTML in Vim, select the HTML
- in Vim and paste it in a rich edit box in Firefox.
- You probably want to add this only temporarily,
- possibly use BufEnter autocommands.
- Only supported for GTK version 2 and later.
- Only available with the |+multi_byte| feature.
-
- *clipboard-exclude*
- exclude:{pattern}
- Defines a pattern that is matched against the name of
- the terminal 'term'. If there is a match, no
- connection will be made to the X server. This is
- useful in this situation:
- - Running Vim in a console.
- - $DISPLAY is set to start applications on another
- display.
- - You do not want to connect to the X server in the
- console, but do want this in a terminal emulator.
- To never connect to the X server use: >
- exclude:.*
- The value of 'magic' is ignored, {pattern} is
- interpreted as if 'magic' was on.
- The rest of the option value will be used for
- {pattern}, this must be the last entry.
-
*'cmdheight'* *'ch'*
'cmdheight' 'ch' number (default 1)
global