[Emacs-diffs] Changes to emacs/lisp/server.el

[John Paul Wallington]

Index: emacs/lisp/server.el
diff -c emacs/lisp/server.el:1.92 emacs/lisp/server.el:1.93
*** emacs/lisp/server.el:1.92   Sat Apr 12 15:05:41 2003
--- emacs/lisp/server.el        Fri Jul 25 08:16:18 2003
***************
*** 249,255 ****
    ;; 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))
    ;; 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.
--- 249,256 ----
    ;; 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!
!   (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.