From 82c5f3e2307d6ee741f52fa8bc439eac28c17c75 Mon Sep 17 00:00:00 2001
From: Kazuki Sakamoto <sakamoto@splhack.org>
Date: Wed, 31 Jan 2018 21:49:08 -0800
Subject: [PATCH] Fix merge

---
 src/MacVim/gui_macvim.m  | 4 +++-
 src/if_python3.c         | 5 -----
 src/proto/gui_macvim.pro | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/MacVim/gui_macvim.m b/src/MacVim/gui_macvim.m
index 1733c1f7b5..f3e9842ab7 100644
--- a/src/MacVim/gui_macvim.m
+++ b/src/MacVim/gui_macvim.m
@@ -1252,8 +1252,10 @@ gui_mch_start_blink(void)
  * Stop the cursor blinking.  Show the cursor if it wasn't shown.
  */
     void
-gui_mch_stop_blink(void)
+gui_mch_stop_blink(int may_call_gui_update_cursor)
 {
+    if (may_call_gui_update_cursor)
+        gui_update_cursor(TRUE, FALSE);
     [[MMBackend sharedInstance] stopBlink];
 }
 
diff --git a/src/if_python3.c b/src/if_python3.c
index aab5a5ae92..02d913492c 100644
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -872,11 +872,6 @@ Python3_Init(void)
 #ifdef PYTHON3_HOME
 	else if (mch_getenv((char_u *)"PYTHONHOME") == NULL)
 	    Py_SetPythonHome(PYTHON3_HOME);
-# endif
-#else
-# ifdef PYTHON3_HOME
-	Py_SetPythonHome(PYTHON3_HOME);
-# endif
 #endif
 
 	PyImport_AppendInittab("vim", Py3Init_vim);
diff --git a/src/proto/gui_macvim.pro b/src/proto/gui_macvim.pro
index b2d2f2e49d..a7949bfc6c 100644
--- a/src/proto/gui_macvim.pro
+++ b/src/proto/gui_macvim.pro
@@ -188,7 +188,7 @@ gui_mch_settitle(char_u *title, char_u *icon);
     void
 gui_mch_start_blink(void);
     void
-gui_mch_stop_blink(void);
+gui_mch_stop_blink(int may_call_gui_update_cursor);
     void
 gui_mch_toggle_tearoffs(int enable);
     void