From 61642d9a2705c8d740250a6069a7fc2cd2f96cda Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Thu, 31 Jan 2013 09:33:03 +0100 Subject: [PATCH] * net/tramp.el (tramp-tramp-file-p): Comment check for `string-as-unibyte'. The function does not exist on XEmacs, and likely we need another approach. * net/tramp-sh.el (tramp-compute-multi-hops): Check, whether `tramp-gw-*' variables are bound. --- lisp/ChangeLog | 9 +++++++++ lisp/net/tramp-sh.el | 2 +- lisp/net/tramp.el | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c1142a45e8d..c2be5f5fae4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2013-01-31 Michael Albinus + + * net/tramp.el (tramp-tramp-file-p): Comment check for + `string-as-unibyte'. The function does not exist on XEmacs, and + likely we need another approach. + + * net/tramp-sh.el (tramp-compute-multi-hops): Check, whether + `tramp-gw-*' variables are bound. + 2013-01-31 Glenn Morris * files.el (basic-save-buffer-2): Choose coding system for diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index a06d64d400a..345da7b958f 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -4272,7 +4272,7 @@ Gateway hops are already opened." (setq choices tramp-default-proxies-alist))))) ;; Handle gateways. - (when (and tramp-gw-tunnel-method tramp-gw-socks-method + (when (and (boundp 'tramp-gw-tunnel-method) (boundp 'tramp-gw-socks-method) (string-match (format "^\\(%s\\|%s\\)$" tramp-gw-tunnel-method tramp-gw-socks-method) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index ea3b5d56a38..4f31e95aeff 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -1158,7 +1158,7 @@ If the `tramp-methods' entry does not exist, return nil." It checks also, whether NAME is unibyte encoded." (save-match-data (and (stringp name) - (string-equal name (string-as-unibyte name)) +; (string-equal name (string-as-unibyte name)) (string-match tramp-file-name-regexp name)))) (defun tramp-find-method (method user host) -- 2.39.5