aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorYichao Zhou <broken.zhou@gmail.com>2017-03-27 18:42:03 -0700
committerJustin M. Keyes <justinkz@gmail.com>2018-06-28 01:49:40 +0200
commit12481781a0215c2ba0ab250d9cfdb9a082ab495a (patch)
tree58cc551eac8fb54092419196699c4378fcd6031c /runtime
parent166aaf178cce457381e80f0e5230a0f941f0e17c (diff)
downloadrneovim-12481781a0215c2ba0ab250d9cfdb9a082ab495a.tar.gz
rneovim-12481781a0215c2ba0ab250d9cfdb9a082ab495a.tar.bz2
rneovim-12481781a0215c2ba0ab250d9cfdb9a082ab495a.zip
highlight: high-priority CursorLine if fg is set. #8578
closes #7383 closes #7715 This implements the compromise described in #7383: * low-priority CursorLine if foreground is not set * high-priority ("same as Vim" priority) CursorLine if foreground is set ref d1874ab2821d076397290cc154d87ec2dc352c79 ref 56eda2aa17c80ba380b606f9466f288fb8162dd3
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/syntax.txt8
-rw-r--r--runtime/doc/vim_diff.txt1
2 files changed, 4 insertions, 5 deletions
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 88b45900a2..83030bf713 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -4841,15 +4841,13 @@ ColorColumn used for the columns set with 'colorcolumn'
Conceal placeholder characters substituted for concealed
text (see 'conceallevel')
*hl-Cursor*
-Cursor the character under the cursor
+Cursor character under the cursor
*hl-CursorIM*
CursorIM like Cursor, but used when in IME mode |CursorIM|
*hl-CursorColumn*
-CursorColumn the screen column that the cursor is in when 'cursorcolumn' is
- set
+CursorColumn screen column at the cursor, when 'cursorcolumn' is set
*hl-CursorLine*
-CursorLine the screen line that the cursor is in when 'cursorline' is
- set
+CursorLine screen line at the cursor, when 'cursorline' is set
*hl-Directory*
Directory directory names (and other special names in listings)
*hl-DiffAdd*
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 52f6b3d918..8bda114639 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -306,6 +306,7 @@ other arguments if used).
Highlight groups:
|hl-ColorColumn|, |hl-CursorColumn| are lower priority than most other
groups
+ |hl-CursorLine| is low-priority unless foreground color is set
Macro/|recording| behavior
Replay of a macro recorded during :lmap produces the same actions as when it