diff options
| author | John Paul Wallington <jpw@pobox.com> | 2003-07-25 12:16:18 +0000 |
|---|---|---|
| committer | John Paul Wallington <jpw@pobox.com> | 2003-07-25 12:16:18 +0000 |
| commit | 60f8ea53494c5202476162acb984d968041ad1d5 (patch) | |
| tree | 2fdb2e873b33d9783b4022794cce08454c801cc5 /lisp/server.el | |
| parent | ee103a412e0797def95508e54f3aa4b98b446671 (diff) | |
| download | emacs-60f8ea53494c5202476162acb984d968041ad1d5.tar.gz | |
(server-start): Check `server-process' is non-nil
before killing it to avoid killing current buffer's process.
Diffstat (limited to 'lisp/server.el')
| -rw-r--r-- | lisp/server.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/server.el b/lisp/server.el index 71e2463c595..36cad64dde5 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -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. |