[Emacs-diffs] Changes to emacs/lisp/net/tramp.el,v

[Michael W. Olson]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael W. Olson <mwolson>      08/02/09 05:52:08

Index: net/tramp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp.el,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -b -r1.175 -r1.176
--- net/tramp.el        3 Feb 2008 12:05:05 -0000       1.175
+++ net/tramp.el        9 Feb 2008 05:52:07 -0000       1.176
@@ -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)
+    (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")
+           (mapconcat 'identity (split-string tramp-end-of-output "\n")
+                      "\r?\n")
        (line-beginning-position -8) t)
-      (delete-region (point) (point-max)))))
+          (delete-region (point) (point-max)))))))
 
 (defun tramp-open-connection-setup-interactive-shell (proc vec)
   "Set up an interactive shell.