averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-06-11 15:37:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Kazuki Sakamoto
2018-01-31 21:49:08 -08:00
parent 6db5cf39e7
commit 82c5f3e230
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MacVim/gui_macvim.m
+3 -1
View File
@@ -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];
}
src/if_python3.c
-5
View File
@@ -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
+1 -1
View File
@@ -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