Fix merge

Author: splhack

src/MacVim/gui_macvim.m

@@ -1252,8 +1252,10 @@
  * 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];
 }
 

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);

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