aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorJosh Rahm <joshuarahm@gmail.com>2023-11-30 10:50:33 -0700
committerJosh Rahm <joshuarahm@gmail.com>2023-11-30 10:50:33 -0700
commit24b6f70ab129e2c0a8b3b03ea02b54b03ee8e664 (patch)
treefc359e92d41e63b463712616f7af29ab42528597 /runtime
parent8a98d50685575d20fcd6ad0dc7031d489d5e5361 (diff)
parent21cb7d04c387e4198ca8098a884c78b56ffcf4c2 (diff)
downloadrneovim-24b6f70ab129e2c0a8b3b03ea02b54b03ee8e664.tar.gz
rneovim-24b6f70ab129e2c0a8b3b03ea02b54b03ee8e664.tar.bz2
rneovim-24b6f70ab129e2c0a8b3b03ea02b54b03ee8e664.zip
Merge remote-tracking branch 'origin/colorcolchar' into 20231130_mix
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/options.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index ba1d848962..ae09e1687e 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1393,7 +1393,8 @@ A jump table for the options with a short description can be found at |Q_op|.
'colorcolumn' 'cc' string (default "")
local to window
'colorcolumn' is a comma-separated list of screen columns that are
- highlighted with ColorColumn |hl-ColorColumn|. Useful to align
+ highlighted with ColorColumn |hl-ColorColumn| and drawn using the
+ "colorcol" option from 'fillchars'. Useful to align
text. Will make screen redrawing slower.
The screen column can be an absolute number, or a number preceded with
'+' or '-', which is added to or subtracted from 'textwidth'. >
@@ -2508,6 +2509,7 @@ A jump table for the options with a short description can be found at |Q_op|.
diff '-' deleted lines of the 'diff' option
msgsep ' ' message separator 'display'
eob '~' empty lines at the end of a buffer
+ colorcol ' ' character to display in the colorcolumn
lastline '@' 'display' contains lastline/truncate
Any one that is omitted will fall back to the default.
@@ -2542,6 +2544,7 @@ A jump table for the options with a short description can be found at |Q_op|.
fold Folded |hl-Folded|
diff DiffDelete |hl-DiffDelete|
eob EndOfBuffer |hl-EndOfBuffer|
+ colorcol:c ColorColumn |hl-ColorColumn|
lastline NonText |hl-NonText|
*'fixendofline'* *'fixeol'* *'nofixendofline'* *'nofixeol'*