diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2021-11-15 17:50:15 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2021-11-15 17:50:15 +0100 |
| commit | 5b250ca79b9aeeeea0b521db9645882240f08c9f (patch) | |
| tree | d1f3ae462fb3f57b0379a905e784ad6a07bd7f7d /lisp/net/tramp-cache.el | |
| parent | 83023117de77c3c41286b0eeb56e2e5417080c43 (diff) | |
| download | emacs-5b250ca79b9aeeeea0b521db9645882240f08c9f.tar.gz emacs-5b250ca79b9aeeeea0b521db9645882240f08c9f.tar.bz2 emacs-5b250ca79b9aeeeea0b521db9645882240f08c9f.zip | |
Fix minor problems resulting from Tramp regression tests
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add comment.
* lisp/net/tramp-cache.el (tramp-flush-file-upper-properties):
FILE can be "~".
* lisp/net/tramp.el ('tramp-ensure-dissected-file-name):
Add `tramp-suppress-trace' property.
(tramp-get-debug-buffer): Add local key for debugging.
(tramp-handle-abbreviate-file-name): Adapt implementation.
* test/lisp/net/tramp-tests.el
(tramp-test07-abbreviate-file-name):
Adapt test.
(tramp-test17-insert-directory-one-file)
(tramp--test-check-files): Use proper `no-dir' argument for
`dired-get-filename'.
Diffstat (limited to 'lisp/net/tramp-cache.el')
| -rw-r--r-- | lisp/net/tramp-cache.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el index 5e7d24ff72b..f2be297d59c 100644 --- a/lisp/net/tramp-cache.el +++ b/lisp/net/tramp-cache.el @@ -224,7 +224,9 @@ Return VALUE." (defun tramp-flush-file-upper-properties (key file) "Remove some properties of FILE's upper directory." (when (file-name-absolute-p file) - (let ((file (directory-file-name (file-name-directory file)))) + ;; `file-name-directory' can return nil, for example for "~". + (when-let ((file (file-name-directory file)) + (file (directory-file-name file))) ;; Unify localname. Remove hop from `tramp-file-name' structure. (setq file (tramp-compat-file-name-unquote file) key (copy-tramp-file-name key)) |