Mercurial > vim
comparison src/option.c @ 8969:c83e2c1e7f2b v7.4.1770
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Apr 21 21:10:14 2016 +0200
patch 7.4.1770
Problem: Cannot use true color in the terminal.
Solution: Add the 'guicolors' option. (Nikolai Pavlov)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 21 Apr 2016 21:15:07 +0200 |
| parents | 0e7b1897ceb3 |
| children | 773d627cac0b |
comparison
equal
deleted
inserted
replaced
| 8968:4794235d1bb0 | 8969:c83e2c1e7f2b |
|---|---|
| 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 {"guicursor", "gcr", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP, | 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, | |
| 1309 #ifdef CURSOR_SHAPE | 1318 #ifdef CURSOR_SHAPE |
| 1310 (char_u *)&p_guicursor, PV_NONE, | 1319 (char_u *)&p_guicursor, PV_NONE, |
| 1311 { | 1320 { |
| 1312 # ifdef FEAT_GUI | 1321 # ifdef FEAT_GUI |
| 1313 (char_u *)"n-v-c:block-Cursor/lCursor,ve:ver35-Cursor,o:hor50-Cursor,i-ci:ver25-Cursor/lCursor,r-cr:hor20-Cursor/lCursor,sm:block-Cursor-blinkwait175-blinkoff150-blinkon175", | 1322 (char_u *)"n-v-c:block-Cursor/lCursor,ve:ver35-Cursor,o:hor50-Cursor,i-ci:ver25-Cursor/lCursor,r-cr:hor20-Cursor/lCursor,sm:block-Cursor-blinkwait175-blinkoff150-blinkon175", |
| 3009 p_term("t_WS", T_CWS) | 3018 p_term("t_WS", T_CWS) |
| 3010 p_term("t_xn", T_XN) | 3019 p_term("t_xn", T_XN) |
| 3011 p_term("t_xs", T_XS) | 3020 p_term("t_xs", T_XS) |
| 3012 p_term("t_ZH", T_CZH) | 3021 p_term("t_ZH", T_CZH) |
| 3013 p_term("t_ZR", T_CZR) | 3022 p_term("t_ZR", T_CZR) |
| 3023 p_term("t_8f", T_8F) | |
| 3024 p_term("t_8b", T_8B) | |
| 3014 | 3025 |
| 3015 /* terminal key codes are not in here */ | 3026 /* terminal key codes are not in here */ |
| 3016 | 3027 |
| 3017 /* end marker */ | 3028 /* end marker */ |
| 3018 {NULL, NULL, 0, NULL, PV_NONE, {NULL, NULL} SCRIPTID_INIT} | 3029 {NULL, NULL, 0, NULL, PV_NONE, {NULL, NULL} SCRIPTID_INIT} |
| 8351 } | 8362 } |
| 8352 } | 8363 } |
| 8353 | 8364 |
| 8354 #endif | 8365 #endif |
| 8355 | 8366 |
| 8367 #ifdef FEAT_TERMTRUECOLOR | |
| 8368 /* 'guicolors' */ | |
| 8369 else if ((int *)varp == &p_guicolors) | |
| 8370 { | |
| 8371 # ifdef FEAT_GUI | |
| 8372 if (!gui.in_use && !gui.starting) | |
| 8373 # endif | |
| 8374 highlight_gui_started(); | |
| 8375 } | |
| 8376 #endif | |
| 8377 | |
| 8356 /* | 8378 /* |
| 8357 * End of handling side effects for bool options. | 8379 * End of handling side effects for bool options. |
| 8358 */ | 8380 */ |
| 8359 | 8381 |
| 8360 /* after handling side effects, call autocommand */ | 8382 /* after handling side effects, call autocommand */ |