From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 22 Mar 2018 08:37:48 +0000 (+0100)
Subject: Fix Bug#30904
X-Git-Tag: emacs-27.0.90~5436
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0a53c71fe27a61b7c8cc576d570bf82ca650247d;p=emacs.git

Fix Bug#30904

* lisp/net/tramp.el (tramp-dissect-file-name): Adapt docstring.  (Bug#30904)
---

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'."
       tramp-default-host))
 
 (defun tramp-dissect-file-name (name &optional nodefault)
-  "Return a `tramp-file-name' structure.
-The structure consists of remote method, remote user, remote host,
-localname (file name on remote host) and hop.  If NODEFAULT is
-non-nil, the file name parts are not expanded to their default
-values."
+  "Return a `tramp-file-name' structure of NAME, a remote file name.
+The structure consists of method, user, domain, host, port,
+localname (file name on remote host), and hop.
+
+Unless NODEFAULT is non-nil, method, user and host are expanded
+to their default values. For the other file name parts, no
+default values are used."
   (save-match-data
     (unless (tramp-tramp-file-p name)
       (tramp-compat-user-error nil "Not a Tramp file name: \"%s\"" name))