[vim] 127/139: patch 7.4.1809 Problem: Using wrong short option name for 'termguicolors'. Solution: Use the option name.

[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 868cfc19bb079a16ca58884b551486566f35419b
Author: Bram Moolenaar <Bram at vim.org>
Date:   Sat Apr 30 16:49:58 2016 +0200

    patch 7.4.1809
    Problem:    Using wrong short option name for 'termguicolors'.
    Solution:   Use the option name.
---
 runtime/optwin.vim | 2 +-
 src/version.c      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index 7576cec..b780e03 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -414,7 +414,7 @@ call append("$", "hlsearch\thighlight all matches for the last used search patte
 call <SID>BinOptionG("hls", &hls)
 if has("termguicolors")
   call append("$", "termguicolors\tuse GUI colors for the terminal")
-  call <SID>BinOptionG("tgc", &gcol)
+  call <SID>BinOptionG("tgc", &tgc)
 endif
 if has("syntax")
   call append("$", "cursorcolumn\thighlight the screen column of the cursor")
diff --git a/src/version.c b/src/version.c
index 1fff5c9..59673b5 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 */
 /**/
+    1809,
+/**/
     1808,
 /**/
     1807,

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