From 977ede64fee880cc025955e39ed1f055240abe50 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Fri, 28 Sep 2007 16:55:00 +0000 Subject: [PATCH] (server-delete-client): Only delete the terminal if it is non-nil. --- lisp/ChangeLog | 5 +++++ lisp/server.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c40a759d351..0befa154ee1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-09-28 Dan Nicolaescu + + * server.el (server-delete-client): Only delete the terminal if it + is non-nil. + 2007-09-28 Michael Albinus * net/tramp.el (with-file-property, with-connection-property): diff --git a/lisp/server.el b/lisp/server.el index 04da434f737..b6061617f88 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -275,7 +275,8 @@ If NOFRAME is non-nil, let the frames live. (To be used from ;; Delete the client's tty. (let ((terminal (process-get proc 'terminal))) - (when (eq (terminal-live-p terminal) t) + ;; Only delete the terminal if it is non-nil. + (when (and terminal (eq (terminal-live-p terminal) t)) (delete-terminal terminal))) ;; Delete the client's process. -- 2.11.4.GIT