Fix Bug#10085

* lisp/net/tramp.el (tramp-find-foreign-file-name-handler):
Add optional arguments OPERATION and COMPETION.  Handle
`file-name-as-directory', `file-name-directory' and
`file-name-nondirectory' also in completion mode.
(tramp-file-name-handler): Use it.  (Bug#10085)

* test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name):
Extend test.

1 files changed, 13 insertions, 1 deletions

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index a12ee387576..5090a5b0e41 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -637,7 +637,19 @@ This checks also `file-name-as-directory', `file-name-directory',
   (should
    (string-equal (file-name-nondirectory "/method:host:/path/to/file/") ""))
   (should-not
-   (unhandled-file-name-directory "/method:host:/path/to/file")))
+   (unhandled-file-name-directory "/method:host:/path/to/file"))
+
+  ;; Bug#10085.
+  (dolist (n-e '(nil t))
+    (let ((non-essential n-e))
+      (dolist (file
+               `(,(file-remote-p tramp-test-temporary-file-directory 'method)
+                 ,(file-remote-p tramp-test-temporary-file-directory 'host)))
+        (setq file (format "/%s:" file))
+        (should (string-equal (directory-file-name file) file))
+        (should (string-equal (file-name-as-directory file) (concat file "./")))
+        (should (string-equal (file-name-directory file) file))
+        (should (string-equal (file-name-nondirectory file) ""))))))
 
 (ert-deftest tramp-test07-file-exists-p ()
   "Check `file-exist-p', `write-region' and `delete-file'."