diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2018-02-04 13:25:10 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2018-02-04 13:25:10 +0100 |
| commit | d2630e456923d2bd70fdd59267fe6e3d8eeb69ca (patch) | |
| tree | ca1fdb4b4048a2a16a4db53e81b7e8cc6af15b71 /lisp/net/tramp-cmds.el | |
| parent | 327d251f8a857350a78029c31c7ab3f9797cc727 (diff) | |
| download | emacs-d2630e456923d2bd70fdd59267fe6e3d8eeb69ca.tar.gz emacs-d2630e456923d2bd70fdd59267fe6e3d8eeb69ca.tar.bz2 emacs-d2630e456923d2bd70fdd59267fe6e3d8eeb69ca.zip | |
Make tramp-archive fit for older Emacsen
* lisp/net/tramp-archive.el (tramp-archive-enabled)
(tramp-archive-file-name-handler-alist)
(tramp-archive-file-name-handler): Adapt docstring.
(tramp-register-archive-file-name-handler): Remove it from
`after-init-hook' when unloading.
(tramp-archive-gvfs-host): New defsubst.
(tramp-archive-dissect-file-name): Use it.
* lisp/net/tramp-cmds.el (tramp-cleanup-all-connections):
Check that `tramp-archive-enabled' is bound.
* test/lisp/net/tramp-archive-tests.el (tramp-archive-test42-auto-load):
Check also that tramp-archive is not loaded when Tramp is loaded.
(tramp-archive-test42-delay-load): Adapt test messages.
Diffstat (limited to 'lisp/net/tramp-cmds.el')
| -rw-r--r-- | lisp/net/tramp-cmds.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el index ab3768a91f4..cbb9cd37005 100644 --- a/lisp/net/tramp-cmds.el +++ b/lisp/net/tramp-cmds.el @@ -144,7 +144,8 @@ This includes password cache, file cache, connection cache, buffers." (clrhash tramp-cache-data) ;; Cleanup local copies of archives. - (tramp-archive-cleanup-hash) + (when (bound-and-true-p tramp-archive-enabled) + (tramp-archive-cleanup-hash)) ;; Remove buffers. (dolist (name (tramp-list-tramp-buffers)) |