diff options
Diffstat (limited to 'src/clientserver.c')
-rw-r--r-- | src/clientserver.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/clientserver.c b/src/clientserver.c index ccb7238725..2a091a6e97 100644 --- a/src/clientserver.c +++ b/src/clientserver.c @@ -191,38 +191,38 @@ static char_u *build_drop_cmd(int filec, char **filev, int tabs, int sendReply); void exec_on_server(mparm_T *parmp) { - if (parmp->serverName_arg == NULL || *parmp->serverName_arg != NUL) - { + if (parmp->serverName_arg != NULL && *parmp->serverName_arg == NUL) + return; + # ifdef MSWIN - // Initialise the client/server messaging infrastructure. - serverInitMessaging(); + // Initialise the client/server messaging infrastructure. + serverInitMessaging(); # endif - /* - * When a command server argument was found, execute it. This may - * exit Vim when it was successful. Otherwise it's executed further - * on. Remember the encoding used here in "serverStrEnc". - */ - if (parmp->serverArg) - { - cmdsrv_main(&parmp->argc, parmp->argv, - parmp->serverName_arg, &parmp->serverStr); - parmp->serverStrEnc = vim_strsave(p_enc); - } + /* + * When a command server argument was found, execute it. This may + * exit Vim when it was successful. Otherwise it's executed further + * on. Remember the encoding used here in "serverStrEnc". + */ + if (parmp->serverArg) + { + cmdsrv_main(&parmp->argc, parmp->argv, + parmp->serverName_arg, &parmp->serverStr); + parmp->serverStrEnc = vim_strsave(p_enc); + } - // If we're still running, get the name to register ourselves. - // On Win32 can register right now, for X11 need to setup the - // clipboard first, it's further down. - parmp->servername = serverMakeName(parmp->serverName_arg, - parmp->argv[0]); + // If we're still running, get the name to register ourselves. + // On Win32 can register right now, for X11 need to setup the + // clipboard first, it's further down. + parmp->servername = serverMakeName(parmp->serverName_arg, + parmp->argv[0]); # ifdef MSWIN - if (parmp->servername != NULL) - { - serverSetName(parmp->servername); - vim_free(parmp->servername); - } -# endif + if (parmp->servername != NULL) + { + serverSetName(parmp->servername); + vim_free(parmp->servername); } +# endif } /* |