aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2017-05-16 11:22:33 +0200
committerMichael Albinus2017-05-16 11:22:33 +0200
commit014f1cc06438f75c3fe267ae92e706855bba675d (patch)
tree226782616955a17f70038226df71dcd4bd7cf643
parent4635016869f7b85dfe37669674677a7dcaab20c4 (diff)
downloademacs-014f1cc06438f75c3fe267ae92e706855bba675d.tar.gz
emacs-014f1cc06438f75c3fe267ae92e706855bba675d.zip
* lisp/net/tramp.el: Avoid recursive load of Tramp. (Bug#26943)
-rw-r--r--lisp/net/tramp.el8
1 files changed, 7 insertions, 1 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 8c317df9767..99cb7d19b0b 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2058,8 +2058,14 @@ ARGS are the arguments OPERATION has been called with."
2058 `(let ((debug-on-error tramp-debug-on-error)) 2058 `(let ((debug-on-error tramp-debug-on-error))
2059 (tramp-compat-condition-case-unless-debug ,var ,bodyform ,@handlers))) 2059 (tramp-compat-condition-case-unless-debug ,var ,bodyform ,@handlers)))
2060 2060
2061;; This is to avoid recursive load.
2062;;;###autoload(defun tramp-file-name-handler (operation &rest args)
2063;;;###autoload "Load Tramp file name handler, and perform OPERATION."
2064;;;###autoload (let ((default-directory temporary-file-directory))
2065;;;###autoload (load "tramp" nil t))
2066;;;###autoload (apply operation args))
2067
2061;; Main function. 2068;; Main function.
2062;;;###autoload
2063(defun tramp-file-name-handler (operation &rest args) 2069(defun tramp-file-name-handler (operation &rest args)
2064 "Invoke Tramp file name handler. 2070 "Invoke Tramp file name handler.
2065Falls back to normal file name handler if no Tramp file name handler exists." 2071Falls back to normal file name handler if no Tramp file name handler exists."