From 14f67fa6a5b630ede1927cd94710e2a1ba6d21d5 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 8 Oct 1995 19:42:11 +0000 Subject: [PATCH] (server-start): Try both full hostname and shortened hostname when deleting the socket file. --- lisp/server.el | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/lisp/server.el b/lisp/server.el index 0d1e0827ba1..5097f987963 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -147,9 +147,18 @@ 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)) + (let* ((sysname (system-name)) + (dot-index (string-match "\\." sysname))) + (condition-case () + (delete-file (format "/tmp/esrv%d-%s" (user-uid) sysname)) + (error nil)) + ;; In case the server file name was made with a domainless hostname, + ;; try deleting that name too. + (if dot-index + (condition-case () + (delete-file (format "/tmp/esrv%d-%s" (user-uid) + (substring sysname 0 dot-index))) + (error nil)))) ;; If we already had a server, clear out associated status. (while server-clients (let ((buffer (nth 1 (car server-clients)))) -- 2.39.2