/* Client process that communicates with GNU Emacs acting as server.
-Copyright (C) 1986-1987, 1994, 1999-2015 Free Software Foundation, Inc.
+Copyright (C) 1986-1987, 1994, 1999-2016 Free Software Foundation, Inc.
This file is part of GNU Emacs.
GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
break;
default:
- message (true, "Try `%s --help' for more information\n", progname);
+ message (true, "Try '%s --help' for more information\n", progname);
exit (EXIT_FAILURE);
break;
}
/* 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;
}
/* 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;
}
if ((argc - optind < 1) && !eval && current_frame)
{
message (true, "%s: file name or argument required\n"
- "Try `%s --help' for more information\n",
+ "Try '%s --help' for more information\n",
progname, progname);
exit (EXIT_FAILURE);
}