# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1190998500 0
# Node ID 90cae4d53a9c0994084b7d900a8586516b3b9ae2
# Parent  fa9dd0b54e5402f00db5d5ea7920822e5ffe60f0
(server-delete-client): Only delete the terminal if it
is non-nil.

diff -r fa9dd0b54e54 -r 90cae4d53a9c lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Sep 28 16:05:49 2007 +0000
+++ b/lisp/ChangeLog	Fri Sep 28 16:55:00 2007 +0000
@@ -1,3 +1,8 @@
+2007-09-28  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* server.el (server-delete-client): Only delete the terminal if it
+	is non-nil.
+
 2007-09-28  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp.el (with-file-property, with-connection-property):
diff -r fa9dd0b54e54 -r 90cae4d53a9c lisp/server.el
--- a/lisp/server.el	Fri Sep 28 16:05:49 2007 +0000
+++ b/lisp/server.el	Fri Sep 28 16:55:00 2007 +0000
@@ -275,7 +275,8 @@
 
       ;; 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.