Merge remote-tracking branch 'origin/master' into feature/pgtk

1 files changed, 1 insertions, 2 deletions

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 11485a229d3..7769e015edc 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1474,7 +1474,6 @@ set_local_socket (char const *server_name)
   else
     {
       /* socket_name is a file name component.  */
-      sock_status = ENOENT;
       char const *xdg_runtime_dir = egetenv ("XDG_RUNTIME_DIR");
       if (xdg_runtime_dir)
         {
@@ -1484,7 +1483,7 @@ set_local_socket (char const *server_name)
                          ? connect_socket (AT_FDCWD, sockname, s, 0)
                          : ENAMETOOLONG);
         }
-      if (sock_status == ENOENT)
+      else
         {
           char const *tmpdir = egetenv ("TMPDIR");
           if (tmpdir)