Merge from emacs--rel--22

[gnu-emacs] / lisp / net / tramp-ftp.el

diff --git a/lisp/net/tramp-ftp.el b/lisp/net/tramp-ftp.el
index 5ad73a7d4b627aa022a3e14f74390d8a31ce9cb1..b05add13cd9ba09868e6502be96d7e16457cb836 100644 (file)
--- a/lisp/net/tramp-ftp.el
+++ b/lisp/net/tramp-ftp.el
@@ -189,7 +189,7 @@ pass to the OPERATION."
        ;; local file name could be in Tramp syntax as well (for
        ;; example, returning VMS file names like "/DISK$CAM:/AAA").
        ;; That's why we set also `tramp-mode' to nil.
-       (t (let* ((tramp-mode nil)
+       (t (let* (;(tramp-mode nil)
                 (inhibit-file-name-handlers
                  (list 'tramp-file-name-handler
                        'tramp-completion-file-name-handler