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
2017-03-19 21:23:11 -07:00
parent 731d06581d
commit ba3505c326
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MacVim/gui_macvim.m
+1 -1
View File
@@ -1897,7 +1897,7 @@ serverRegisterName(char_u *name)
*/
int
serverSendToVim(char_u *name, char_u *cmd, char_u **result,
int *port, int asExpr, int silent)
int *port, int asExpr, int timeout, int silent)
{
#ifdef FEAT_MBYTE
name = CONVERT_TO_UTF8(name);
src/main.c
+3 -3
View File
@@ -3943,12 +3943,12 @@ cmdsrv_main(
p = serverGetReply(srv, NULL, TRUE, TRUE, 0);
if (p == NULL)
break;
# else
if (serverReadReply(xterm_dpy, srv, &p, TRUE, -1) < 0)
break;
# elif defined(MAC_CLIENTSERVER)
if (serverReadReply(srv, &p) < 0)
break;
# else
if (serverReadReply(xterm_dpy, srv, &p, TRUE, -1) < 0)
break;
# endif
j = atoi((char *)p);
if (j >= 0 && j < numFiles)
src/proto/gui_macvim.pro
+1 -1
View File
@@ -197,7 +197,7 @@ ex_macaction(exarg_T *eap);
gui_make_popup(char_u *path_name, int mouse_pos);
void serverRegisterName(char_u *name);
int serverSendToVim(char_u *name, char_u *cmd, char_u **result, int *server, int asExpr, int silent);
int serverSendToVim(char_u *name, char_u *cmd, char_u **result, int *server, int asExpr, int timeout, int silent);
char_u *serverGetVimNames(void);
int serverStrToPort(char_u *str);
int serverPeekReply(int port, char_u **str);