(server-delete-client): Only delete the terminal if it

is non-nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c40a759d3513d1e533cc631aa760f07f47efc6c6..0befa154ee1f29bec58dac2e114742c6e4d0166f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/server.el b/lisp/server.el
index 04da434f73713d186c3c495b616cfe60ba2792dc..b6061617f88132dfdc4c549a9b9b1b9a2b5081c5 100644 (file)
--- 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.