diff options
| author | Stefan Kangas <stefan@marxist.se> | 2021-12-10 06:30:33 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2021-12-10 06:30:33 +0100 |
| commit | d601fd4692e0be3c9ee9b247c8a7bc5b2499f0eb (patch) | |
| tree | 0339b89fd03e38c327c77c40f25864a2b9666078 /lib-src | |
| parent | 59db96d83ae837b3a3d82a979cd97a271bcd86bf (diff) | |
| parent | 7a25ba0fdebf5e94fa5a3a3d992424f86b1547cc (diff) | |
| download | emacs-d601fd4692e0be3c9ee9b247c8a7bc5b2499f0eb.tar.gz emacs-d601fd4692e0be3c9ee9b247c8a7bc5b2499f0eb.tar.bz2 emacs-d601fd4692e0be3c9ee9b247c8a7bc5b2499f0eb.zip | |
Merge from origin/emacs-28
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...
Diffstat (limited to 'lib-src')
| -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 6afea6f3063..ea9f72dfae0 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -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) |