diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2021-12-09 09:03:10 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2021-12-09 12:03:37 -0800 |
| commit | dda63370669dba6dfda53dec62de8b1c1c275b2d (patch) | |
| tree | 0d45a0e21afa73bf925d9b8d9e896536b4586839 | |
| parent | 26fb4168b884eeb910580c42e87efb73399019c9 (diff) | |
| download | emacs-dda63370669dba6dfda53dec62de8b1c1c275b2d.tar.gz | |
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.
| -rw-r--r-- | lib-src/emacsclient.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index cff3cec2a79..d11fd88c45e 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) |