changeset 84967:90cae4d53a9c

(server-delete-client): Only delete the terminal if it is non-nil.
author Dan Nicolaescu <dann@ics.uci.edu>
date Fri, 28 Sep 2007 16:55:00 +0000
parents fa9dd0b54e54
children 85eb2660cbe3
files lisp/ChangeLog lisp/server.el
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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):
--- 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.