master 7aad73f: Merge from origin/emacs-28

[Michael Albinus]

branch: master
commit 7aad73febfd10627996edb1d6264e2abac4d2c65
Merge: 9a59d90 6dae01a
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>

    Merge from origin/emacs-28
    
    6dae01ad6d Fix tramp-compat-file-name-concat (Bug#51754)
---
 lisp/net/tramp-compat.el | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index 213ab58..fbc3d68 100644
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -386,14 +386,17 @@ CONDITION can also be a list of error conditions."
   (if (fboundp 'file-name-concat)
       #'file-name-concat
     (lambda (directory &rest components)
-      (unless (null directory)
-       (let ((components (delq nil components))
-             file-name-handler-alist)
-         (if (null components)
-             directory
-           (tramp-compat-file-name-concat
-            (concat (file-name-as-directory directory) (car components))
-            (cdr components))))))))
+      (let ((components (cl-remove-if (lambda (el)
+                                        (or (null el) (equal "" el)))
+                                      components))
+           file-name-handler-alist)
+        (if (null components)
+           directory
+          (apply #'tramp-compat-file-name-concat
+                (concat (unless (or (equal "" directory) (null directory))
+                           (file-name-as-directory directory))
+                         (car components))
+                (cdr components)))))))
 
 (dolist (elt (all-completions "tramp-compat-" obarray 'functionp))
   (put (intern elt) 'tramp-suppress-trace t))