aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2018-03-22 09:37:48 +0100
committerMichael Albinus2018-03-22 09:37:48 +0100
commit0a53c71fe27a61b7c8cc576d570bf82ca650247d (patch)
tree01a310dc1d371619fdb34bb6d1e44aa98abf638c
parentcae9e0fa0358d6323b57a288b5661dc72d36356d (diff)
downloademacs-0a53c71fe27a61b7c8cc576d570bf82ca650247d.tar.gz
emacs-0a53c71fe27a61b7c8cc576d570bf82ca650247d.zip
Fix Bug#30904
* lisp/net/tramp.el (tramp-dissect-file-name): Adapt docstring. (Bug#30904)
-rw-r--r--lisp/net/tramp.el12
1 files changed, 7 insertions, 5 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index fe9f1976944..5930bcdd4fc 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1339,11 +1339,13 @@ This is HOST, if non-nil. Otherwise, it is `tramp-default-host'."
1339 tramp-default-host)) 1339 tramp-default-host))
1340 1340
1341(defun tramp-dissect-file-name (name &optional nodefault) 1341(defun tramp-dissect-file-name (name &optional nodefault)
1342 "Return a `tramp-file-name' structure. 1342 "Return a `tramp-file-name' structure of NAME, a remote file name.
1343The structure consists of remote method, remote user, remote host, 1343The structure consists of method, user, domain, host, port,
1344localname (file name on remote host) and hop. If NODEFAULT is 1344localname (file name on remote host), and hop.
1345non-nil, the file name parts are not expanded to their default 1345
1346values." 1346Unless NODEFAULT is non-nil, method, user and host are expanded
1347to their default values. For the other file name parts, no
1348default values are used."
1347 (save-match-data 1349 (save-match-data
1348 (unless (tramp-tramp-file-p name) 1350 (unless (tramp-tramp-file-p name)
1349 (tramp-compat-user-error nil "Not a Tramp file name: \"%s\"" name)) 1351 (tramp-compat-user-error nil "Not a Tramp file name: \"%s\"" name))