# HG changeset patch
# User Michael Olson <mwolson@gnu.org>
# Date 1202536327 0
# Node ID 2a8a6f33e88a35e300e81c362ee39e74561087d8
# Parent  dc73ee82d684ef298f5567fcd451e273eeb1ac7a
net/tramp.el (tramp-process-sentinel): Avoid error when process buffer killed.

diff -r dc73ee82d684 -r 2a8a6f33e88a lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Feb 09 03:52:59 2008 +0000
+++ b/lisp/ChangeLog	Sat Feb 09 05:52:07 2008 +0000
@@ -1,3 +1,9 @@
+2008-02-09  Michael Olson  <mwolson@gnu.org>
+
+	* net/tramp.el (tramp-process-sentinel): Avoid error when process
+	buffer has been killed, such as by
+	`tramp-cleanup-all-connections'.
+
 2008-02-09  Miles Bader  <miles@gnu.org>
 
 	* net/rcirc.el (rcirc-omit-mode): Suppress invisibility ellipsis.
diff -r dc73ee82d684 -r 2a8a6f33e88a lisp/net/tramp.el
--- a/lisp/net/tramp.el	Sat Feb 09 03:52:59 2008 +0000
+++ b/lisp/net/tramp.el	Sat Feb 09 05:52:07 2008 +0000
@@ -5654,12 +5654,15 @@
     ;; The "Connection closed" and "exit" messages disturb the output
     ;; for asynchronous processes. That's why we have echoed the Tramp
     ;; prompt at the end.  Trailing messages can be removed.
-    (with-current-buffer (process-buffer proc)
-      (goto-char (point-max))
-      (re-search-backward
-       (mapconcat 'identity (split-string tramp-end-of-output "\n") "\r?\n")
-       (line-beginning-position -8) t)
-      (delete-region (point) (point-max)))))
+    (let ((buf (process-buffer proc)))
+      (when (buffer-live-p buf)
+        (with-current-buffer buf
+          (goto-char (point-max))
+          (re-search-backward
+           (mapconcat 'identity (split-string tramp-end-of-output "\n")
+                      "\r?\n")
+           (line-beginning-position -8) t)
+          (delete-region (point) (point-max)))))))
 
 (defun tramp-open-connection-setup-interactive-shell (proc vec)
   "Set up an interactive shell.