diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2022-06-20 12:47:27 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2022-06-20 12:47:27 +0200 |
| commit | 8400c59358c69574f3eeb2751b517f94abb28274 (patch) | |
| tree | 7b7a6ff01916938a084a5b62734a22d057c1a17a /lisp/net/tramp-archive.el | |
| parent | 854714efb47d3365c41a84443fa56e7e275bfb4c (diff) | |
| download | emacs-8400c59358c69574f3eeb2751b517f94abb28274.tar.gz emacs-8400c59358c69574f3eeb2751b517f94abb28274.tar.bz2 emacs-8400c59358c69574f3eeb2751b517f94abb28274.zip | |
Fix problems with Tramp FTP and URL handler mode
* lisp/net/tramp-archive.el (tramp-archive-run-real-handler):
Add ;;;###tramp-autoload cookie.
* lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler): Prevent invocation
of `tramp-archive-file-name-handler'. (Bug#56078)
* lisp/url/url-tramp.el (url-tramp-convert-url-to-tramp)
(url-tramp-convert-tramp-to-url): Make them more robust.
Diffstat (limited to 'lisp/net/tramp-archive.el')
| -rw-r--r-- | lisp/net/tramp-archive.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/net/tramp-archive.el b/lisp/net/tramp-archive.el index f30aa021b64..119ac54dd29 100644 --- a/lisp/net/tramp-archive.el +++ b/lisp/net/tramp-archive.el @@ -309,7 +309,8 @@ Operations not mentioned here will be handled by the default Emacs primitives.") #'tramp-archive-file-name-p)) (apply #'tramp-file-name-for-operation operation args))) -(defun tramp-archive-run-real-handler (operation args) +;;;###tramp-autoload +(progn (defun tramp-archive-run-real-handler (operation args) "Invoke normal file name handler for OPERATION. First arg specifies the OPERATION, second arg ARGS is a list of arguments to pass to the OPERATION." @@ -319,7 +320,7 @@ arguments to pass to the OPERATION." ,(and (eq inhibit-file-name-operation operation) inhibit-file-name-handlers))) (inhibit-file-name-operation operation)) - (apply operation args))) + (apply operation args)))) ;;;###tramp-autoload (defun tramp-archive-file-name-handler (operation &rest args) |