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

diff --git a/lisp/server.el b/lisp/server.el
index 12d7c1290c2e14daab5a7c93edd25763d3ad2e15..857ffa6b9f099077de8a26f10e8d08dabc6d8114 100644 (file)
--- 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.