diff options
| author | Michael Albinus | 2018-03-22 09:37:48 +0100 |
|---|---|---|
| committer | Michael Albinus | 2018-03-22 09:37:48 +0100 |
| commit | 0a53c71fe27a61b7c8cc576d570bf82ca650247d (patch) | |
| tree | 01a310dc1d371619fdb34bb6d1e44aa98abf638c | |
| parent | cae9e0fa0358d6323b57a288b5661dc72d36356d (diff) | |
| download | emacs-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.el | 12 |
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. |
| 1343 | The structure consists of remote method, remote user, remote host, | 1343 | The structure consists of method, user, domain, host, port, |
| 1344 | localname (file name on remote host) and hop. If NODEFAULT is | 1344 | localname (file name on remote host), and hop. |
| 1345 | non-nil, the file name parts are not expanded to their default | 1345 | |
| 1346 | values." | 1346 | Unless NODEFAULT is non-nil, method, user and host are expanded |
| 1347 | to their default values. For the other file name parts, no | ||
| 1348 | default 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)) |