diff options
| author | Michael Albinus | 2017-12-17 11:31:23 +0100 |
|---|---|---|
| committer | Michael Albinus | 2017-12-17 11:32:48 +0100 |
| commit | b4486de0c6484a09dcd6485c19062419279ca296 (patch) | |
| tree | bdfe6d2de117753a2843b27c4a3d161eb74edfe6 /lisp | |
| parent | bd9e8b31a1a38a2ffa5c2ff5e805a42ffccc36ec (diff) | |
| download | emacs-b4486de0c6484a09dcd6485c19062419279ca296.tar.gz emacs-b4486de0c6484a09dcd6485c19062419279ca296.zip | |
Minor fixes in Tramp
* lisp/net/tramp-archive.el
(tramp-archive-handle-temporary-file-directory): New defun.
(tramp-archive-file-name-handler-alist): Use it.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test99-libarchive-tests): Rename it.
* test/lisp/net/tramp-tests.el (tramp-test34-vc-registered):
Skip for older Emacsen.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/net/tramp-archive.el | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lisp/net/tramp-archive.el b/lisp/net/tramp-archive.el index cfd68fb8361..d3b2712fb39 100644 --- a/lisp/net/tramp-archive.el +++ b/lisp/net/tramp-archive.el | |||
| @@ -245,7 +245,7 @@ It must be supported by libarchive(3).") | |||
| 245 | (shell-command . tramp-archive-handle-not-implemented) | 245 | (shell-command . tramp-archive-handle-not-implemented) |
| 246 | (start-file-process . tramp-archive-handle-not-implemented) | 246 | (start-file-process . tramp-archive-handle-not-implemented) |
| 247 | ;; `substitute-in-file-name' performed by default handler. | 247 | ;; `substitute-in-file-name' performed by default handler. |
| 248 | ;; `temporary-file-directory' performed by default handler. | 248 | (temporary-file-directory . tramp-archive-handle-temporary-file-directory) |
| 249 | (unhandled-file-name-directory . ignore) | 249 | (unhandled-file-name-directory . ignore) |
| 250 | (vc-registered . ignore) | 250 | (vc-registered . ignore) |
| 251 | (verify-visited-file-modtime . tramp-handle-verify-visited-file-modtime) | 251 | (verify-visited-file-modtime . tramp-handle-verify-visited-file-modtime) |
| @@ -530,6 +530,14 @@ offered." | |||
| 530 | (load | 530 | (load |
| 531 | (tramp-archive-gvfs-file-name file) noerror nomessage nosuffix must-suffix)) | 531 | (tramp-archive-gvfs-file-name file) noerror nomessage nosuffix must-suffix)) |
| 532 | 532 | ||
| 533 | (defun tramp-archive-handle-temporary-file-directory () | ||
| 534 | "Like `temporary-file-directory' for Tramp files." | ||
| 535 | ;; If the default directory, the file archive, is located on a | ||
| 536 | ;; mounted directory, it is returned as it. Not what we want. | ||
| 537 | (with-parsed-tramp-archive-file-name default-directory nil | ||
| 538 | (let ((default-directory (file-name-directory archive))) | ||
| 539 | (temporary-file-directory)))) | ||
| 540 | |||
| 533 | (defun tramp-archive-handle-not-implemented (operation &rest args) | 541 | (defun tramp-archive-handle-not-implemented (operation &rest args) |
| 534 | "Generic handler for operations not implemented for file archives." | 542 | "Generic handler for operations not implemented for file archives." |
| 535 | (let ((v (ignore-errors | 543 | (let ((v (ignore-errors |