summaryrefslogtreecommitdiff
path: root/lisp/server.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1994-07-11 20:36:53 +0000
committerRichard M. Stallman <rms@gnu.org>1994-07-11 20:36:53 +0000
commite89da28d298a5382772fef9707e82dca07a71ed1 (patch)
treea13861b6747f65ff8c79ba085e27abdc95b65768 /lisp/server.el
parent0588a76157987ab96848d53b73c846e9f16e55ac (diff)
downloademacs-e89da28d298a5382772fef9707e82dca07a71ed1.tar.gz
(server-start): Try both possible socket file names for the file to delete.
Diffstat (limited to 'lisp/server.el')
-rw-r--r--lisp/server.el3
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."
(set-process-sentinel server-process nil)
(condition-case () (delete-process server-process) (error nil))))
(condition-case () (delete-file "~/.emacs_server") (error nil))
+ (condition-case ()
+ (delete-file (format "/tmp/esrv%d-%s" (user-uid) (system-name)))
+ (error nil))
;; If we already had a server, clear out associated status.
(while server-clients
(let ((buffer (nth 1 (car server-clients))))