summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2018-07-25 13:18:46 +0200
committerMichael Albinus <michael.albinus@gmx.de>2018-07-25 13:18:46 +0200
commitc67407e7520a97a92737200bf559c48a927db470 (patch)
tree555b750976eb7c147061bc4eae0ff410b9202ed2 /lisp
parent200195e824befa112459c0afbac7c94aea739573 (diff)
downloademacs-c67407e7520a97a92737200bf559c48a927db470.tar.gz
Instrument shadowfile{-tests} for error hunting on hydra.
* lisp/shadowfile.el (shadow-make-fullname): Use changed `tramp-make-tramp-file-name' from Tramp 2.4. * test/lisp/shadowfile-tests.el (shadow-test08-shadow-todo): Instrument test. Suppress errors in cleanup. (shadow-test09-shadow-copy-files): Suppress errors in cleanup.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/shadowfile.el9
1 files changed, 1 insertions, 8 deletions
diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el
index 27d934d9fce..180d5026b6e 100644
--- a/lisp/shadowfile.el
+++ b/lisp/shadowfile.el
@@ -307,14 +307,7 @@ Replace HOST, and NAME when non-nil."
(if (null (tramp-file-name-method hup))
(format
"/%s:%s" (tramp-file-name-host hup) (tramp-file-name-localname hup))
- (tramp-make-tramp-file-name
- (tramp-file-name-method hup)
- (tramp-file-name-user hup)
- (tramp-file-name-domain hup)
- (tramp-file-name-host hup)
- (tramp-file-name-port hup)
- (tramp-file-name-localname hup)
- (tramp-file-name-hop hup)))))
+ (tramp-make-tramp-file-name hup))))
(defun shadow-replace-name-component (fullname newname)
"Return FULLNAME with the name component changed to NEWNAME."