Mercurial > vim

changeset 10512:675dfe47ab69 v8.0.0146

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/287266527abc163e191a06dd70518bbbdab4468f Author: Bram Moolenaar <Bram@vim.org> Date: Fri Jan 6 18:16:19 2017 +0100 patch 8.0.0146: termguicolors uses wrong colors on MS-Windows with ConEmu Problem: When using 'termguicolors' on MS-Windows the RGB definition causes the colors to be wrong. Solution: Undefined RGB and use our own. (Gabriel Barta)
author Christian Brabandt <cb@256bit.org>
date Fri, 06 Jan 2017 18:30:04 +0100
parents 43fb032ce4fb
children 1a24f8639624
files src/term.c src/version.c
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/term.c
+++ b/src/term.c
@@ -6069,8 +6069,12 @@ hex_digit(int c)
     guicolor_T
 gui_get_color_cmn(char_u *name)
 {
-    /* On MS-Windows an RGB macro is available and it's different from ours,
-     * but does what is needed. */
+    /* On MS-Windows an RGB macro is available and it produces 0x00bbggrr color
+     * values as used by the MS-Windows GDI api.  It should be used only for
+     * MS-Windows GDI builds. */
+# if defined(RGB) && defined(WIN32) && !defined(FEAT_GUI)
+#  undef RGB
+# endif
 # ifndef RGB
 #  define RGB(r, g, b)	((r<<16) | (g<<8) | (b))
 # endif
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    146,
+/**/
     145,
 /**/
     144,