aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2019-07-18 11:10:05 -0400
committerStefan Monnier2019-07-18 11:10:05 -0400
commit8a2f763e5cc0ed5b5eecd6a315ac45310bc7a2dd (patch)
treec801e0f591be8bca1c0d8beb69eac563809a523c
parentdecfdb091ab94bc83564821d29ac0832b45c8d00 (diff)
downloademacs-8a2f763e5cc0ed5b5eecd6a315ac45310bc7a2dd.tar.gz
emacs-8a2f763e5cc0ed5b5eecd6a315ac45310bc7a2dd.zip
* lisp/server.el (server-ensure-safe-dir): Revert part of b663c8372495
A non-cosmetic change that was mistakenly included.
-rw-r--r--lisp/server.el10
1 files changed, 0 insertions, 10 deletions
diff --git a/lisp/server.el b/lisp/server.el
index 3435702a651..d491a260377 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -535,16 +535,6 @@ Creates the directory if necessary and makes sure:
535 (cl-letf (((default-file-modes) ?\700)) (make-directory dir t)) 535 (cl-letf (((default-file-modes) ?\700)) (make-directory dir t))
536 (setq attrs (file-attributes dir 'integer))) 536 (setq attrs (file-attributes dir 'integer)))
537 537
538 (let ((olddir (or (getenv "TMPDIR") "/tmp")))
539 (when (and (equal dir (format "%s/emacs" (getenv "XDG_RUNTIME_DIR")))
540 (file-writable-p olddir))
541 (let ((link (format "%s/emacs%d" olddir (user-uid))))
542 (unless (file-directory-p link)
543 ;; We're using the new location, so try and setup a symlink from
544 ;; the old location, in case we want to use an old emacsclient.
545 ;; FIXME: Check that it's safe to use!
546 (make-symbolic-link dir link t)))))
547
548 ;; Check that it's safe for use. 538 ;; Check that it's safe for use.
549 (let* ((uid (file-attribute-user-id attrs)) 539 (let* ((uid (file-attribute-user-id attrs))
550 (w32 (eq system-type 'windows-nt)) 540 (w32 (eq system-type 'windows-nt))