* net/tramp-sh.el (tramp-maybe-send-script): Don't let-bind the

connection process, it could be nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ebbd696eddf8a99b1b2a343f56c079df418dc26f..afa15eab24ee7b2b983e479e3f6d4e43240d48e7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-27  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp-sh.el (tramp-maybe-send-script): Don't let-bind the
+       connection process, it could be nil.
+
 2011-07-27  Leo Liu  <sdl.web@gmail.com>
 
        Simplify url handling in rcirc-mode.

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index bcd235729089cdea00016ddc61532eed16b0bcdf..5c497748943741e4a4b668a2b79b339c26da3942 100644 (file)
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -3457,8 +3457,10 @@ Fall back to normal file name handler if no Tramp handler exists."
 (defun tramp-maybe-send-script (vec script name)
   "Define in remote shell function NAME implemented as SCRIPT.
 Only send the definition if it has not already been done."
-  (let* ((p (tramp-get-connection-process vec))
-        (scripts (tramp-get-connection-property p "scripts" nil)))
+  ;; We cannot let-bind (tramp-get-connection-process vec) because it
+  ;; might be nil.
+  (let ((scripts (tramp-get-connection-property
+                 (tramp-get-connection-process vec) "scripts" nil)))
     (unless (member name scripts)
       (tramp-with-progress-reporter vec 5 (format "Sending script `%s'" name)
        ;; The script could contain a call of Perl.  This is masked with `%s'.
@@ -3467,7 +3469,8 @@ Only send the definition if it has not already been done."
         (format "%s () {\n%s\n}" name
                 (format script (tramp-get-remote-perl vec)))
         "Script %s sending failed" name)
-       (tramp-set-connection-property p "scripts" (cons name scripts))))))
+       (tramp-set-connection-property
+        (tramp-get-connection-process vec) "scripts" (cons name scripts))))))
 
 (defun tramp-set-auto-save ()
   (when (and ;; ange-ftp has its own auto-save mechanism