patch 7.4.1806

Problem:    'termguicolors' option missing from the options window.
Solution:   Add the entry.

diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index 2ba347eee756ce07f42d5a752b8592242e89ecd2..674d962b93db84bcb837b7a557cd6650176bc5fc 100644 (file)
--- 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 86f38e6390d98c04fdb094f7126c1e47df4a005b..7c05b284c70c87e6d3ef451b3293bce546e0f8bc 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1806,
 /**/
     1805,
 /**/