Commit 60f8ea53 authored by John Paul Wallington's avatar John Paul Wallington

(server-start): Check `server-process' is non-nil

before killing it to avoid killing current buffer's process.
parent ee103a41
......@@ -249,7 +249,8 @@ Prefix arg means just kill any existing server communications subprocess."
;; Make sure there is a safe directory in which to place the socket.
(server-ensure-safe-dir (file-name-directory server-socket-name))
;; kill it dead!
(condition-case () (delete-process server-process) (error nil))
(if server-process
(condition-case () (delete-process server-process) (error nil)))
;; Delete the socket files made by previous server invocations.
(condition-case () (delete-file server-socket-name) (error nil))
;; If this Emacs already had a server, clear out associated status.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment