summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2021-12-10 14:50:21 +0800
committerPo Lu <luangruo@yahoo.com>2021-12-10 14:50:21 +0800
commitcc0f147180300b672894de931bee76b2a3a719e9 (patch)
tree2fca1fb8adcb4aa1726f3274922f78eafe9a1aa5 /lib-src
parent6919d5a7c0a23c14ae77f7c708ea6d0ef2478108 (diff)
parent6e865a7171d80cd91b54c6d71b88d960b920abe3 (diff)
Merge remote-tracking branch 'origin/master' into feature/pgtk
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/emacsclient.c3
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)