procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-28

Browse source 
6dae01ad6d Fix tramp-compat-file-name-concat (Bug#51754)
This commit is contained in:
Michael Albinus 2021-11-11 11:55:15 +01:00
commit 7aad73febf
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lisp/net/tramp-compat.el
View file

@ -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))