# HG changeset patch
# User John Paul Wallington <jpw@pobox.com>
# Date 1059135378 0
# Node ID 283657e79b56f1c8ed04cce77672f7912771af61
# Parent  79432c3dc670c9874451fba6097cfa7dc9b48d7e
(server-start): Check `server-process' is non-nil
before killing it to avoid killing current buffer's process.

diff -r 79432c3dc670 -r 283657e79b56 lisp/server.el
--- a/lisp/server.el	Fri Jul 25 07:03:21 2003 +0000
+++ b/lisp/server.el	Fri Jul 25 12:16:18 2003 +0000
@@ -249,7 +249,8 @@
   ;; 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.