Mercurial > vim

comparison src/vim.h @ 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 f129fd3ebd98
comparison
equal deleted inserted replaced
9026:eea316a77946 9027:773d627cac0b
1557 #define MSG_PUTS_TITLE(s) msg_puts_title((char_u *)(s)) 1557 #define MSG_PUTS_TITLE(s) msg_puts_title((char_u *)(s))
1558 #define MSG_PUTS_LONG(s) msg_puts_long_attr((char_u *)(s), 0) 1558 #define MSG_PUTS_LONG(s) msg_puts_long_attr((char_u *)(s), 0)
1559 #define MSG_PUTS_LONG_ATTR(s, a) msg_puts_long_attr((char_u *)(s), (a)) 1559 #define MSG_PUTS_LONG_ATTR(s, a) msg_puts_long_attr((char_u *)(s), (a))
1560 1560
1561 #ifdef FEAT_GUI 1561 #ifdef FEAT_GUI
1562 # ifdef FEAT_TERMTRUECOLOR 1562 # ifdef FEAT_TERMGUICOLORS
1563 # define GUI_FUNCTION(f) (gui.in_use ? gui_##f : termtrue_##f) 1563 # define GUI_FUNCTION(f) (gui.in_use ? gui_##f : termgui_##f)
1564 # define USE_24BIT (gui.in_use || p_guicolors) 1564 # define USE_24BIT (gui.in_use || p_tgc)
1565 # else 1565 # else
1566 # define GUI_FUNCTION(f) gui_##f 1566 # define GUI_FUNCTION(f) gui_##f
1567 # define USE_24BIT gui.in_use 1567 # define USE_24BIT gui.in_use
1568 # endif 1568 # endif
1569 #else 1569 #else
1570 # ifdef FEAT_TERMTRUECOLOR 1570 # ifdef FEAT_TERMGUICOLORS
1571 # define GUI_FUNCTION(f) termtrue_##f 1571 # define GUI_FUNCTION(f) termgui_##f
1572 # define USE_24BIT p_guicolors 1572 # define USE_24BIT p_tgc
1573 # endif 1573 # endif
1574 #endif 1574 #endif
1575 #ifdef FEAT_TERMTRUECOLOR 1575 #ifdef FEAT_TERMGUICOLORS
1576 # define IS_CTERM (t_colors > 1 || p_guicolors) 1576 # define IS_CTERM (t_colors > 1 || p_tgc)
1577 #else 1577 #else
1578 # define IS_CTERM (t_colors > 1) 1578 # define IS_CTERM (t_colors > 1)
1579 #endif 1579 #endif
1580 #ifdef GUI_FUNCTION 1580 #ifdef GUI_FUNCTION
1581 # define GUI_MCH_GET_RGB GUI_FUNCTION(mch_get_rgb) 1581 # define GUI_MCH_GET_RGB GUI_FUNCTION(mch_get_rgb)