procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged in changes from CVS HEAD

Browse source 
Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-22
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-23
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-24
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-25
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-26
   Fix permission bogosities

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-27
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-28
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-29
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-30
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-50
This commit is contained in:
Karoly Lorentey 2004-01-10 13:27:38 +00:00
commit b80bf66eab
32 changed files with 541 additions and 323 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib-src/emacsclient.c
View file

@ -432,7 +432,7 @@ main (argc, argv)
{
int sock_status = 0;
int oerrno = 0;
int saved_errno = 0;
if (! socket_name)
{
@ -452,7 +452,7 @@ main (argc, argv)
/* See if the socket exists, and if it's owned by us. */
sock_status = socket_status (server.sun_path);
oerrno = errno;
saved_errno = errno;
if (sock_status)
{
/* Failing that, see if LOGNAME or USER exist and differ from
@ -473,7 +473,7 @@ main (argc, argv)
sprintf (server.sun_path, "/tmp/emacs%d-%s/server",
(int) pw->pw_uid, system_name);
sock_status = socket_status (server.sun_path);
oerrno = errno;
saved_errno = errno;
}
}
}
@ -492,14 +492,14 @@ main (argc, argv)
case 2:
/* `stat' failed */
if (errno == ENOENT)
if (saved_errno == ENOENT)
fprintf (stderr,
"%s: Can't find socket; have you started the server?\n\
To start the server in Emacs, type \"M-x server-start\".\n",
argv[0]);
else
fprintf (stderr, "%s: Can't stat %s: %s\n",
argv[0], server.sun_path, strerror (oerrno));
argv[0], server.sun_path, strerror (saved_errno));
fail ();
break;
}