# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 773959013 0
# Node ID 80350a95921a758a2df50ad61bc6e7738c02c2c9
# Parent  686198604dc7057fab9366f66b8f98cb2ef2b74e
(server-start): Try both possible socket file names for the file to delete.

diff -r 686198604dc7 -r 80350a95921a lisp/server.el
--- a/lisp/server.el	Mon Jul 11 20:29:09 1994 +0000
+++ b/lisp/server.el	Mon Jul 11 20:36:53 1994 +0000
@@ -147,6 +147,9 @@
 	(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))))