Mercurial > emacs
comparison lisp/server.el @ 13157:31242cebf1d3
(server-start): Try both full hostname and shortened
hostname when deleting the socket file.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sun, 08 Oct 1995 19:42:11 +0000 |
| parents | c668502d5a93 |
| children | 2c8da6b3b9e0 |
comparison
equal
deleted
inserted
replaced
| 13156:a398dbd2b945 | 13157:31242cebf1d3 |
|---|---|
| 145 (if server-process | 145 (if server-process |
| 146 (progn | 146 (progn |
| 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 () | 150 (let* ((sysname (system-name)) |
| 151 (delete-file (format "/tmp/esrv%d-%s" (user-uid) (system-name))) | 151 (dot-index (string-match "\\." sysname))) |
| 152 (error nil)) | 152 (condition-case () |
| 153 (delete-file (format "/tmp/esrv%d-%s" (user-uid) sysname)) | |
| 154 (error nil)) | |
| 155 ;; In case the server file name was made with a domainless hostname, | |
| 156 ;; try deleting that name too. | |
| 157 (if dot-index | |
| 158 (condition-case () | |
| 159 (delete-file (format "/tmp/esrv%d-%s" (user-uid) | |
| 160 (substring sysname 0 dot-index))) | |
| 161 (error nil)))) | |
| 153 ;; If we already had a server, clear out associated status. | 162 ;; If we already had a server, clear out associated status. |
| 154 (while server-clients | 163 (while server-clients |
| 155 (let ((buffer (nth 1 (car server-clients)))) | 164 (let ((buffer (nth 1 (car server-clients)))) |
| 156 (server-buffer-done buffer))) | 165 (server-buffer-done buffer))) |
| 157 (if leave-dead | 166 (if leave-dead |