From a111780dc752b606a7b48edd5ec8b8ecef9ad1de Mon Sep 17 00:00:00 2001
From: Kazuki Sakamoto <sakamoto@splhack.org>
Date: Tue, 3 May 2016 21:44:21 -0700
Subject: [PATCH] Fix termgui_mch_get_color in MacVim

---
 src/MacVim/gui_macvim.m | 3 +++
 src/term.c              | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/src/MacVim/gui_macvim.m b/src/MacVim/gui_macvim.m
index 9e10b02df3..ebb8d2df56 100644
--- a/src/MacVim/gui_macvim.m
+++ b/src/MacVim/gui_macvim.m
@@ -1563,6 +1563,9 @@ gui_mch_flash(int msec)
     guicolor_T
 gui_mch_get_color(char_u *name)
 {
+    if (![MMBackend sharedInstance])
+	return INVALCOLOR;
+
 #ifdef FEAT_MBYTE
     name = CONVERT_TO_UTF8(name);
 #endif
diff --git a/src/term.c b/src/term.c
index 4af9aeb846..017e071af2 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1269,6 +1269,12 @@ static struct builtin_term builtin_termcaps[] =
     guicolor_T
 termgui_mch_get_color(char_u *name)
 {
+# if defined(FEAT_GUI_MACVIM)
+    guicolor_T t;
+    t = gui_mch_get_color(name);
+    if (t != INVALCOLOR)
+	return t;
+# endif
     return gui_get_color_cmn(name);
 }