diff options
| author | Stefan Monnier | 2002-09-27 22:06:02 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2002-09-27 22:06:02 +0000 |
| commit | 15d40fa45425863d9fb47a73d32e6ecf0b8b6263 (patch) | |
| tree | f894f16f3c75a4a286d7948bffb382a7e0628159 | |
| parent | bb76239ba1dea220089ef09cb320909fe57e92e1 (diff) | |
| download | emacs-15d40fa45425863d9fb47a73d32e6ecf0b8b6263.tar.gz emacs-15d40fa45425863d9fb47a73d32e6ecf0b8b6263.zip | |
(server-socket-name): Always use /tmp and non-qualified hostname.
| -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.") | |||
| 148 | (make-variable-buffer-local 'server-existing-buffer) | 148 | (make-variable-buffer-local 'server-existing-buffer) |
| 149 | 149 | ||
| 150 | (defvar server-socket-name | 150 | (defvar server-socket-name |
| 151 | (if (or (not (file-writable-p "~/")) | 151 | (format "/tmp/esrv%d-%s" (user-uid) |
| 152 | (and (file-writable-p "/tmp/") | 152 | (substring (system-name) 0 (string-match "\\." (system-name))))) |
| 153 | (not (zerop (logand (file-modes "/tmp/") 512))))) | ||
| 154 | (format "/tmp/esrv%d-%s" (user-uid) (system-name)) | ||
| 155 | (format "~/.emacs-server-%s" (system-name)))) | ||
| 156 | 153 | ||
| 157 | ;; If a *server* buffer exists, | 154 | ;; If a *server* buffer exists, |
| 158 | ;; write STRING to it for logging purposes. | 155 | ;; write STRING to it for logging purposes. |