diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2002-09-27 22:06:02 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2002-09-27 22:06:02 +0000 |
| commit | 15d40fa45425863d9fb47a73d32e6ecf0b8b6263 (patch) | |
| tree | f894f16f3c75a4a286d7948bffb382a7e0628159 /lisp/server.el | |
| parent | bb76239ba1dea220089ef09cb320909fe57e92e1 (diff) | |
| download | emacs-15d40fa45425863d9fb47a73d32e6ecf0b8b6263.tar.gz | |
(server-socket-name): Always use /tmp and non-qualified hostname.
Diffstat (limited to 'lisp/server.el')
| -rw-r--r-- | lisp/server.el | 7 |
1 files changed, 2 insertions, 5 deletions
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. |