mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Code Issues Releases Activity

Don't abort emacsclientw when -a was specified

Browse Source 
* lib-src/emacsclient.c (set_tcp_socket) [WINDOWSNT]: Don't error
out if we are in emacsclientw and -a was specified.

Copyright-paperwork-exempt: yes
This commit is contained in:
Evgeny Fraimovitch 2015-08-02 17:48:42 +03:00 committed by Eli Zaretskii
parent 0afb8fab99
commit c6a626ebac
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib-src/emacsclient.c
View File

@ -961,6 +961,13 @@ set_tcp_socket (const char *local_server_file)
/* Open up an AF_INET socket. */
if ((s = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
{
/* Since we have an alternate to try out, this is not an error
yet; popping out a modal dialog at this stage would make -a
option totally useless for emacsclientw -- the user will
still get an error message if the alternate editor fails. */
#ifdef WINDOWSNT
if(!(w32_window_app () && alternate_editor))
#endif
sock_err_message ("socket");
return INVALID_SOCKET;
}
@ -968,6 +975,9 @@ set_tcp_socket (const char *local_server_file)
/* Set up the socket. */
if (connect (s, (struct sockaddr *) &server, sizeof server) < 0)
{
#ifdef WINDOWSNT
if(!(w32_window_app () && alternate_editor))
#endif
sock_err_message ("connect");
return INVALID_SOCKET;
}