From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 27 Sep 2002 22:06:02 +0000 (+0000)
Subject: (server-socket-name): Always use /tmp and non-qualified hostname.
X-Git-Tag: ttn-vms-21-2-B4~13024
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=15d40fa45425863d9fb47a73d32e6ecf0b8b6263;p=emacs.git

(server-socket-name): Always use /tmp and non-qualified hostname.
---

diff --git a/lisp/server.el b/lisp/server.el
index 12d7c1290c2..857ffa6b9f0 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -148,11 +148,8 @@ are done with it in the server.")
 (make-variable-buffer-local 'server-existing-buffer)
 
 (defvar server-socket-name
-  (if (or (not (file-writable-p "~/"))
-	  (and (file-writable-p "/tmp/")
-	       (not (zerop (logand (file-modes "/tmp/") 512)))))
-      (format "/tmp/esrv%d-%s" (user-uid) (system-name))
-    (format "~/.emacs-server-%s" (system-name))))
+  (format "/tmp/esrv%d-%s" (user-uid)
+	  (substring (system-name) 0 (string-match "\\." (system-name)))))
 
 ;; If a *server* buffer exists,
 ;; write STRING to it for logging purposes.