emacs/gnu.emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2026-09-10 07:46:51 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

emacsclient: coalesce WINDOWSNT-specific code

Browse source 
* lib-src/emacsclient.c (sock_err_message) [WINDOWSNT]:
Do nothing if w32_window_app () && alternate_editor.
Both callers changed.
This commit is contained in:
Paul Eggert 2018-11-22 09:32:33 -08:00
parent 5773470ff3
commit 7a85753d35
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib-src/emacsclient.c
View file

@ -753,14 +753,17 @@ enum { AUTH_KEY_LENGTH = 64 };
/* Socket used to communicate with the Emacs server process. */
static HSOCKET emacs_socket = 0;
/* On Windows, the socket library was historically separate from the
standard C library, so errors are handled differently. */
static void
sock_err_message (const char *function_name)
{
# ifdef WINDOWSNT
char* msg = NULL;
/* On Windows, the socket library was historically separate from the
standard C library, so errors are handled differently. */
if (w32_window_app () && alternate_editor)
return;
char *msg = NULL;
FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM
| FORMAT_MESSAGE_ALLOCATE_BUFFER
@ -1000,9 +1003,6 @@ set_tcp_socket (const char *local_server_file)
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;
}
@ -1010,9 +1010,6 @@ set_tcp_socket (const char *local_server_file)
/* Set up the socket. */
if (connect (s, &server.sa, sizeof server.in) != 0)
{
# ifdef WINDOWSNT
if(!(w32_window_app () && alternate_editor))
# endif
sock_err_message ("connect");
return INVALID_SOCKET;
}