Merged in changes from CVS HEAD

Patches applied:

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

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

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

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


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

2 files changed, 9 insertions, 0 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 6aa96d2cc91..3e66cba3563 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-24  Richard M. Stallman  <rms@gnu.org>
+
+        * emacsclient.c (main): Restore errno from saved_errno,
+        so the error message comes from socket_status.
+
 2004-01-08  Andreas Schwab  <schwab@suse.de>
 
         * emacsclient.c (main): Save errno from socket_status.
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 9ab9dc30a62..d70be8c7491 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -473,12 +473,14 @@ main (argc, argv)
            that init_editfns uses to set the global Vuser_full_name.  */
 
         char *user_name = (char *) getenv ("LOGNAME");
+
         if (!user_name)
           user_name = (char *) getenv ("USER");
 
         if (user_name)
           {
             struct passwd *pw = getpwnam (user_name);
+
             if (pw && (pw->pw_uid != geteuid ()))
               {
                 /* We're running under su, apparently. */
@@ -497,6 +499,8 @@ main (argc, argv)
                 sock_status = socket_status (server.sun_path);
                 saved_errno = errno;
               }
+            else
+              errno = saved_errno;
           }
       }