procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

emacsclient takes more care about XDG_RUNTIME_DIR

Browse source 
* 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.
This commit is contained in:
Paul Eggert 2021-12-09 09:03:10 -08:00
parent 26fb4168b8
commit dda6337066
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib-src/emacsclient.c
View file

@ -1456,7 +1456,6 @@ set_local_socket (char const *server_name)
else else
{ {
/* socket_name is a file name component. */ /* socket_name is a file name component. */
sock_status = ENOENT;
char const *xdg_runtime_dir = egetenv ("XDG_RUNTIME_DIR"); char const *xdg_runtime_dir = egetenv ("XDG_RUNTIME_DIR");
if (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) ? connect_socket (AT_FDCWD, sockname, s, 0)
: ENAMETOOLONG); : ENAMETOOLONG);
} }
if (sock_status == ENOENT) else
{ {
char const *tmpdir = egetenv ("TMPDIR"); char const *tmpdir = egetenv ("TMPDIR");
if (tmpdir) if (tmpdir)