diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2017-05-28 23:44:10 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2017-05-28 23:44:10 +0200 |
| commit | e7bb7cc29bc27b368a066c088943c93b1c689b23 (patch) | |
| tree | 228e28975ce1c0202be9a0f160d5f827e87f5ce5 /lisp/net/tramp-gvfs.el | |
| parent | 288b3ca2e519903653b9bc88d281ecd9f6b162a4 (diff) | |
| download | emacs-e7bb7cc29bc27b368a066c088943c93b1c689b23.tar.gz emacs-e7bb7cc29bc27b368a066c088943c93b1c689b23.tar.bz2 emacs-e7bb7cc29bc27b368a066c088943c93b1c689b23.zip | |
Some tweaks, almost all for Tramp adb method
* lisp/net/tramp-adb.el (tramp-adb-parse-device-names):
Use `make-tramp-file-name'.
(tramp-adb-get-device): Use `tramp-file-name-port-or-default'.
(tramp-adb-maybe-open-connection): Set "prompt" property.
(tramp-adb-wait-for-output): Use it.
* lisp/net/tramp-cache.el (tramp-cache-print): Use `elt'.
(tramp-dump-connection-properties): Check also that there are
properties to be saved. Don't save "started" property of
"ftp" method.
* lisp/net/tramp-gvfs.el (tramp-gvfs-handle-expand-file-name):
Use `make-tramp-file-name'.
* lisp/net/tramp.el (tramp-remote-file-name-spec-regexp):
Host could be empty.
(tramp-file-name-port-or-default): New defun.
(tramp-dissect-file-name): Simplify `make-tramp-file-name' call.
(tramp-handle-file-name-case-insensitive-p): Use a progress reporter.
(tramp-call-process, tramp-call-process-region):
Use `make-tramp-file-name'.
* test/lisp/net/tramp-tests.el (tramp-test03-file-name-defaults):
Revert change from 2017-05-24.
(tramp-test05-expand-file-name-relative): Let it also pass for
"adb" method.
Diffstat (limited to 'lisp/net/tramp-gvfs.el')
| -rw-r--r-- | lisp/net/tramp-gvfs.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index c016c7e0274..d031c73c3f7 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -788,7 +788,9 @@ file names." (when (string-match "\\`\\(~\\)\\(/\\|\\'\\)" localname) (save-match-data (tramp-gvfs-maybe-open-connection - (tramp-make-tramp-file-name method user domain host port "/" hop))) + (make-tramp-file-name + :method method :user user :domain domain + :host host :port port :localname "/" :hop hop))) (setq localname (replace-match (tramp-get-connection-property v "default-location" "~") |