masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-04 11:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Po Lu 2021-12-10 14:50:21 +08:00
commit cc0f147180
25 changed files with 66 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib-src/emacsclient.c
View file

@ -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)