[vim] 124/139: patch 7.4.1806 Problem: 'termguicolors' option missing from the options window. Solution: Add the entry.

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit 8e3d1b6326c103cc92f8d07b1161ee5172acf201
Author: Bram Moolenaar <Bram at vim.org>
Date:   Sat Apr 30 15:17:19 2016 +0200

    patch 7.4.1806
    Problem:    'termguicolors' option missing from the options window.
    Solution:   Add the entry.
---
 runtime/optwin.vim | 6 +++++-
 src/version.c      | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index 2ba347e..674d962 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -1,7 +1,7 @@
 " These commands create the option window.
 "
 " Maintainer:	Bram Moolenaar <Bram at 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 86f38e6..7c05b28 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,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git