Merged in changes from CVS HEAD

Patches applied:

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

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


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-45

1 files changed, 1 insertions, 1 deletions

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index f45ca56c0d3..d737b2a11eb 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -470,7 +470,7 @@ main (argc, argv)
             if (pw && (pw->pw_uid != geteuid ()))
               {
                 /* We're running under su, apparently. */
-                sprintf (server.sun_path, "/tmp/esrv%d-%s",
+                sprintf (server.sun_path, "/tmp/emacs%d-%s/server",
                          (int) pw->pw_uid, system_name);
                 sock_status = socket_status (server.sun_path);
                 oerrno = errno;