* net/tramp-sh.el (tramp-sh-handle-start-file-process): Fix previous patch.

(tramp-gw-tunnel-method, tramp-gw-socks-method): Declare for
compatibility.
(tramp-compute-multi-hops): Check, whether
`tramp-gw-tunnel-method' and `tramp-gw-socks-method' are non-nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9a449498a5d746b963feecca836381caaed43d1d..ba982253949a756df0a1045f82342d34c43d51ce 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,10 @@
        * net/tramp-sh.el (tramp-sh-handle-start-file-process): Catch
        `suppress'.  Otherwise, `tramp-run-real-handler' might be called
        in `tramp-file-name-handler'.
+       (tramp-gw-tunnel-method, tramp-gw-socks-method): Declare for
+       compatibility.
+       (tramp-compute-multi-hops): Check, whether
+       `tramp-gw-tunnel-method' and `tramp-gw-socks-method' are non-nil.
 
 2013-01-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index bb4224540f8460680abb177c1127c6a19fb006b8..63e966b91b2c04faf2d375bc9dfc64c22c96082b 100644 (file)
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2826,20 +2826,20 @@ the result will be a local, non-Tramp, filename."
        (unwind-protect
            ;; We catch this event.  Otherwise, `start-process' could
            ;; be called on the local host.
-           (catch 'suppress
-             (save-excursion
-               (save-restriction
-                 ;; Activate narrowing in order to save BUFFER
-                 ;; contents.  Clear also the modification time;
-                 ;; otherwise we might be interrupted by
-                 ;; `verify-visited-file-modtime'.
-                 (let ((buffer-undo-list t)
-                       (buffer-read-only nil)
-                       (mark (point)))
-                   (clear-visited-file-modtime)
-                   (narrow-to-region (point-max) (point-max))
-                   ;; We call `tramp-maybe-open-connection', in order
-                   ;; to cleanup the prompt afterwards.
+           (save-excursion
+             (save-restriction
+               ;; Activate narrowing in order to save BUFFER
+               ;; contents.  Clear also the modification time;
+               ;; otherwise we might be interrupted by
+               ;; `verify-visited-file-modtime'.
+               (let ((buffer-undo-list t)
+                     (buffer-read-only nil)
+                     (mark (point)))
+                 (clear-visited-file-modtime)
+                 (narrow-to-region (point-max) (point-max))
+                 ;; We call `tramp-maybe-open-connection', in order
+                 ;; to cleanup the prompt afterwards.
+                 (catch 'suppress
                    (tramp-maybe-open-connection v)
                    (widen)
                    (delete-region mark (point))
@@ -2864,7 +2864,7 @@ the result will be a local, non-Tramp, filename."
 
          ;; Save exit.
          (if (string-match tramp-temp-buffer-name (buffer-name))
-             (progn
+             (ignore-errors
                (set-process-buffer (tramp-get-connection-process v) nil)
                (kill-buffer (current-buffer)))
            (set-buffer-modified-p bmp))
@@ -4209,6 +4209,9 @@ Goes through the list `tramp-inline-compress-commands'."
        (tramp-message
         vec 2 "Couldn't find an inline transfer compress command")))))
 
+(defvar tramp-gw-tunnel-method)
+(defvar tramp-gw-socks-method)
+
 (defun tramp-compute-multi-hops (vec)
   "Expands VEC according to `tramp-default-proxies-alist'.
 Gateway hops are already opened."
@@ -4269,10 +4272,11 @@ Gateway hops are already opened."
            (setq choices tramp-default-proxies-alist)))))
 
     ;; Handle gateways.
-    (when (string-match
-          (format
-           "^\\(%s\\|%s\\)$" tramp-gw-tunnel-method tramp-gw-socks-method)
-          (tramp-file-name-method (car target-alist)))
+    (when (and tramp-gw-tunnel-method tramp-gw-socks-method
+              (string-match
+               (format
+                "^\\(%s\\|%s\\)$" tramp-gw-tunnel-method tramp-gw-socks-method)
+               (tramp-file-name-method (car target-alist))))
       (let ((gw (pop target-alist))
            (hop (pop target-alist)))
        ;; Is the method prepared for gateways?