summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2018-11-22 09:32:33 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2018-11-22 09:33:00 -0800
commit7a85753d35b9b010baed7e297f72b308318c3b67 (patch)
tree1ed0cd16a2ee984f8469469e2f75ec2f32ccf58d /lib-src
parent5773470ff3a85640fbaeab1a88edc3fa395184bd (diff)
downloademacs-7a85753d35b9b010baed7e297f72b308318c3b67.tar.gz
emacsclient: coalesce WINDOWSNT-specific code
* lib-src/emacsclient.c (sock_err_message) [WINDOWSNT]: Do nothing if w32_window_app () && alternate_editor. Both callers changed.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/emacsclient.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index e6eb3c74cf7..6f2fb20ae52 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -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;
}