commit 61be73bb0f965a895bfb064ea3e55476ac175162
author Bram Moolenaar <Bram@vim.org> Fri Apr 29 22:59:22 2016 +0200
committer Bram Moolenaar <Bram@vim.org> Fri Apr 29 22:59:22 2016 +0200
tree 1e8383f05effc05a320c2e803ff6f2b431c2507c
parent bb82762907ba024717ad9af3b229c2fa6405cd36

patch 7.4.1799
Problem:    'guicolors' is a confusing option name.
Solution:   Use 'termguicolors' instead. (Hirohito Higashi)

src/option.c

diff --git a/src/option.c b/src/option.c
index da02864..d048cec 100644
--- a/src/option.c
+++ b/src/option.c
@@ -1305,15 +1305,6 @@
 			    {(char_u *)NULL, (char_u *)0L}
 #endif
 			    SCRIPTID_INIT},
-    {"guicolors",   "gcol", P_BOOL|P_VI_DEF|P_VIM|P_RCLR,
-#ifdef FEAT_TERMTRUECOLOR
-			    (char_u *)&p_guicolors, PV_NONE,
-			    {(char_u *)FALSE, (char_u *)FALSE}
-#else
-			    (char_u*)NULL, PV_NONE,
-			    {(char_u *)FALSE, (char_u *)FALSE}
-#endif
-			    SCRIPTID_INIT},
     {"guicursor",    "gcr", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
 #ifdef CURSOR_SHAPE
 			    (char_u *)&p_guicursor, PV_NONE,
@@ -2625,6 +2616,15 @@
 			    {(char_u *)0L, (char_u *)0L}
 #endif
 			    SCRIPTID_INIT},
+    {"termguicolors", "tgc", P_BOOL|P_VI_DEF|P_VIM|P_RCLR,
+#ifdef FEAT_TERMGUICOLORS
+			    (char_u *)&p_tgc, PV_NONE,
+			    {(char_u *)FALSE, (char_u *)FALSE}
+#else
+			    (char_u*)NULL, PV_NONE,
+			    {(char_u *)FALSE, (char_u *)FALSE}
+#endif
+			    SCRIPTID_INIT},
     {"terse",	    NULL,   P_BOOL|P_VI_DEF,
 			    (char_u *)&p_terse, PV_NONE,
 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
@@ -8364,9 +8364,9 @@
 
 #endif
 
-#ifdef FEAT_TERMTRUECOLOR
-    /* 'guicolors' */
-    else if ((int *)varp == &p_guicolors)
+#ifdef FEAT_TERMGUICOLORS
+    /* 'termguicolors' */
+    else if ((int *)varp == &p_tgc)
     {
 # ifdef FEAT_GUI
 	if (!gui.in_use && !gui.starting)