diff options
| author | Richard M. Stallman | 1994-07-11 20:36:53 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1994-07-11 20:36:53 +0000 |
| commit | e89da28d298a5382772fef9707e82dca07a71ed1 (patch) | |
| tree | a13861b6747f65ff8c79ba085e27abdc95b65768 | |
| parent | 0588a76157987ab96848d53b73c846e9f16e55ac (diff) | |
| download | emacs-e89da28d298a5382772fef9707e82dca07a71ed1.tar.gz emacs-e89da28d298a5382772fef9707e82dca07a71ed1.zip | |
(server-start): Try both possible socket file names for the file to delete.
| -rw-r--r-- | lisp/server.el | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/server.el b/lisp/server.el index 29a9d24c3ad..5b0f88a09f7 100644 --- a/lisp/server.el +++ b/lisp/server.el | |||
| @@ -147,6 +147,9 @@ Prefix arg means just kill any existing server communications subprocess." | |||
| 147 | (set-process-sentinel server-process nil) | 147 | (set-process-sentinel server-process nil) |
| 148 | (condition-case () (delete-process server-process) (error nil)))) | 148 | (condition-case () (delete-process server-process) (error nil)))) |
| 149 | (condition-case () (delete-file "~/.emacs_server") (error nil)) | 149 | (condition-case () (delete-file "~/.emacs_server") (error nil)) |
| 150 | (condition-case () | ||
| 151 | (delete-file (format "/tmp/esrv%d-%s" (user-uid) (system-name))) | ||
| 152 | (error nil)) | ||
| 150 | ;; If we already had a server, clear out associated status. | 153 | ;; If we already had a server, clear out associated status. |
| 151 | (while server-clients | 154 | (while server-clients |
| 152 | (let ((buffer (nth 1 (car server-clients)))) | 155 | (let ((buffer (nth 1 (car server-clients)))) |