From e89da28d298a5382772fef9707e82dca07a71ed1 Mon Sep 17 00:00:00 2001
From: "Richard M. Stallman" <rms@gnu.org>
Date: Mon, 11 Jul 1994 20:36:53 +0000
Subject: [PATCH] (server-start): Try both possible socket file names for the
 file to delete.

---
 lisp/server.el | 3 +++
 1 file changed, 3 insertions(+)

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))))
-- 
2.39.5