# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1507133705 -7200
# Node ID 895da0cbb16ed58c3294b9b1e0e62e586292da89
# Parent  ad52810d239c0514edf19d707a8eb6b2fe4ad688
patch 8.0.1174: Mac Terminal.app has wrong color for white

commit https://github.com/vim/vim/commit/a0a6f2776eabfbd4d9174fabdf3921beb7348eda
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Oct 4 18:04:16 2017 +0200

    patch 8.0.1174: Mac Terminal.app has wrong color for white

    Problem:    Mac Terminal.app has wrong color for white.
    Solution:   Use white from the color cube.

diff --git a/src/globals.h b/src/globals.h
--- a/src/globals.h
+++ b/src/globals.h
@@ -380,6 +380,9 @@ EXTERN int	cterm_normal_bg_color INIT(= 
 EXTERN guicolor_T cterm_normal_fg_gui_color INIT(= INVALCOLOR);
 EXTERN guicolor_T cterm_normal_bg_gui_color INIT(= INVALCOLOR);
 #endif
+#ifdef FEAT_TERMRESPONSE
+EXTERN int	is_mac_terminal INIT(= FALSE);  /* recognized Terminal.app */
+#endif
 
 #ifdef FEAT_AUTOCMD
 EXTERN int	autocmd_busy INIT(= FALSE);	/* Is apply_autocmds() busy? */
diff --git a/src/syntax.c b/src/syntax.c
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -7350,6 +7350,10 @@ lookup_color(int idx, int foreground, in
 	    else
 		color = color_numbers_8[idx];
 	}
+	if (t_colors >= 256 && color == 15 && is_mac_terminal)
+	    /* Terminal.app has a bug: 15 is light grey. Use white
+	     * from the color cube instead. */
+	    color = 231;
     }
     return color;
 }
diff --git a/src/term.c b/src/term.c
--- a/src/term.c
+++ b/src/term.c
@@ -4557,7 +4557,10 @@ check_termcode(
 			/* Mac Terminal.app sends 1;95;0 */
 			if (version == 95
 				&& STRNCMP(tp + extra - 2, "1;95;0c", 7) == 0)
+			{
 			    is_not_xterm = TRUE;
+			    is_mac_terminal = TRUE;
+			}
 
 			/* Gnome terminal sends 1;3801;0, 1;4402;0 or 1;2501;0.
 			 * xfce4-terminal sends 1;2802;0.
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1174,
+/**/
     1173,
 /**/
     1172,