procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* net/tramp.el (tramp-tramp-file-p): Comment check for

Browse source 
`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.
This commit is contained in:
Michael Albinus 2013-01-31 09:33:03 +01:00
parent 9dbda10075
commit 61642d9a27
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/ChangeLog
View file

@ -1,3 +1,12 @@
2013-01-31 Michael Albinus <michael.albinus@gmx.de>
* 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 <rgm@gnu.org>
* files.el (basic-save-buffer-2): Choose coding system for

2
lisp/net/tramp-sh.el
View file

@ -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)

2
lisp/net/tramp.el
View file

@ -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)