Mercurial > vim

comparison src/option.c @ 9027:773d627cac0b v7.4.1799

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Apr 29 22:59:22 2016 +0200 patch 7.4.1799 Problem: 'guicolors' is a confusing option name. Solution: Use 'termguicolors' instead. (Hirohito Higashi)
author Christian Brabandt <cb@256bit.org>
date Fri, 29 Apr 2016 23:00:07 +0200
parents c83e2c1e7f2b
children ea504064c996
comparison
equal deleted inserted replaced
9026:eea316a77946 9027:773d627cac0b
1303 #else 1303 #else
1304 (char_u *)NULL, PV_NONE, 1304 (char_u *)NULL, PV_NONE,
1305 {(char_u *)NULL, (char_u *)0L} 1305 {(char_u *)NULL, (char_u *)0L}
1306 #endif 1306 #endif
1307 SCRIPTID_INIT}, 1307 SCRIPTID_INIT},
1308 {"guicolors", "gcol", P_BOOL|P_VI_DEF|P_VIM|P_RCLR,
1309 #ifdef FEAT_TERMTRUECOLOR
1310 (char_u *)&p_guicolors, PV_NONE,
1311 {(char_u *)FALSE, (char_u *)FALSE}
1312 #else
1313 (char_u*)NULL, PV_NONE,
1314 {(char_u *)FALSE, (char_u *)FALSE}
1315 #endif
1316 SCRIPTID_INIT},
1317 {"guicursor", "gcr", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, 1308 {"guicursor", "gcr", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
1318 #ifdef CURSOR_SHAPE 1309 #ifdef CURSOR_SHAPE
1319 (char_u *)&p_guicursor, PV_NONE, 1310 (char_u *)&p_guicursor, PV_NONE,
1320 { 1311 {
1321 # ifdef FEAT_GUI 1312 # ifdef FEAT_GUI
2621 (char_u *)&p_tenc, PV_NONE, 2612 (char_u *)&p_tenc, PV_NONE,
2622 {(char_u *)"", (char_u *)0L} 2613 {(char_u *)"", (char_u *)0L}
2623 #else 2614 #else
2624 (char_u *)NULL, PV_NONE, 2615 (char_u *)NULL, PV_NONE,
2625 {(char_u *)0L, (char_u *)0L} 2616 {(char_u *)0L, (char_u *)0L}
2617 #endif
2618 SCRIPTID_INIT},
2619 {"termguicolors", "tgc", P_BOOL|P_VI_DEF|P_VIM|P_RCLR,
2620 #ifdef FEAT_TERMGUICOLORS
2621 (char_u *)&p_tgc, PV_NONE,
2622 {(char_u *)FALSE, (char_u *)FALSE}
2623 #else
2624 (char_u*)NULL, PV_NONE,
2625 {(char_u *)FALSE, (char_u *)FALSE}
2626 #endif 2626 #endif
2627 SCRIPTID_INIT}, 2627 SCRIPTID_INIT},
2628 {"terse", NULL, P_BOOL|P_VI_DEF, 2628 {"terse", NULL, P_BOOL|P_VI_DEF,
2629 (char_u *)&p_terse, PV_NONE, 2629 (char_u *)&p_terse, PV_NONE,
2630 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 2630 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
8362 } 8362 }
8363 } 8363 }
8364 8364
8365 #endif 8365 #endif
8366 8366
8367 #ifdef FEAT_TERMTRUECOLOR 8367 #ifdef FEAT_TERMGUICOLORS
8368 /* 'guicolors' */ 8368 /* 'termguicolors' */
8369 else if ((int *)varp == &p_guicolors) 8369 else if ((int *)varp == &p_tgc)
8370 { 8370 {
8371 # ifdef FEAT_GUI 8371 # ifdef FEAT_GUI
8372 if (!gui.in_use && !gui.starting) 8372 if (!gui.in_use && !gui.starting)
8373 # endif 8373 # endif
8374 highlight_gui_started(); 8374 highlight_gui_started();