summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-04-30 15:17:19 +0200
committerBram Moolenaar <Bram@vim.org>2016-04-30 15:17:19 +0200
commit8e3d1b6326c103cc92f8d07b1161ee5172acf201 (patch)
treeceaaf7b220e9ce6f4b5b10d2a885e3f606ce94f0
parent06481427005a9dae39721087df94855f7d4d1feb (diff)
downloadvim-git-8e3d1b6326c103cc92f8d07b1161ee5172acf201.tar.gz
patch 7.4.1806v7.4.1806
Problem: 'termguicolors' option missing from the options window. Solution: Add the entry.
-rw-r--r--runtime/optwin.vim6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index 2ba347eee..674d962b9 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -1,7 +1,7 @@
" These commands create the option window.
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2016 Apr 21
+" Last Change: 2016 Apr 30
" If there already is an option window, jump to that one.
if bufwinnr("option-window") > 0
@@ -412,6 +412,10 @@ call append("$", "highlight\twhich highlighting to use for various occasions")
call <SID>OptionG("hl", &hl)
call append("$", "hlsearch\thighlight all matches for the last used search pattern")
call <SID>BinOptionG("hls", &hls)
+if has("termtruecolor")
+ call append("$", "termguicolors\tuse GUI colors for the terminal")
+ call <SID>BinOptionG("tgc", &gcol)
+endif
if has("syntax")
call append("$", "cursorcolumn\thighlight the screen column of the cursor")
call append("$", "\t(local to window)")
diff --git a/src/version.c b/src/version.c
index 86f38e639..7c05b284c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1806,
+/**/
1805,
/**/
1804,