Fix merge

Author: splhack

src/MacVim/gui_macvim.m

@@ -1897,7 +1897,7 @@ void gui_macvim_release_autoreleasepool(void *pool)
  */
     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

@@ -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

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