From 2cb6087f2b797d4ec21d27bc531998e07848797f Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 8 Dec 2021 15:37:39 -0800 Subject: [PATCH] emacsclient takes more care about XDG_RUNTIME_DIR * lib-src/emacsclient.c (set_local_socket): Revert to the Emacs 27 behavior of not trying TMPDIR if XDG_RUNTIME_DIR is set. This is one of the suggestions made by Jim Porter and independently by Ulrich Mueller in Bug#51327. --- lib-src/emacsclient.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index cff3cec2a7..d11fd88c45 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -1456,7 +1456,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) { @@ -1466,7 +1465,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) -- 2.32.0