mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-28

Browse source 
7a25ba0fde ; * lisp/image-dired.el: Fix typo.
dda6337066 emacsclient takes more care about XDG_RUNTIME_DIR
26fb4168b8 ; Prefer HTTPS in more URLs
6b89578524 ; * lisp/progmodes/flymake.el: Update the minimum Emacs ve...
This commit is contained in:
Stefan Kangas 2021-12-10 06:30:33 +01:00
commit d601fd4692
21 changed files with 25 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib-src/emacsclient.c
View file

@ -1469,7 +1469,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)
{
@ -1479,7 +1478,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)