aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2016-05-12 10:57:10 +0200
committerMichael Albinus2016-05-12 10:57:10 +0200
commita8be7c1ec40c9fab3407a0bc59e20141364e231f (patch)
treea34bb96ee48b6a1cde190eb0c39d1bf4f15af916
parentd32f204856958f2e2412550da17de4e976aa0074 (diff)
downloademacs-a8be7c1ec40c9fab3407a0bc59e20141364e231f.tar.gz
emacs-a8be7c1ec40c9fab3407a0bc59e20141364e231f.zip
Avoid recursive load of tramp.el
* lisp/net/tramp.el (tramp-completion-file-name-handler): Autoload a shortened version of this function, avoid recursive load.
-rw-r--r--lisp/net/tramp.el9
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 6f30f395cd4..41d67d4c79a 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2104,8 +2104,11 @@ preventing reentrant calls of Tramp.")
2104Together with `tramp-locked', this implements a locking mechanism 2104Together with `tramp-locked', this implements a locking mechanism
2105preventing reentrant calls of Tramp.") 2105preventing reentrant calls of Tramp.")
2106 2106
2107;;;###autoload 2107;; Avoid recursive loading of tramp.el.
2108(progn (defun tramp-completion-file-name-handler (operation &rest args) 2108;;;###autoload(defun tramp-completion-file-name-handler (operation &rest args)
2109;;;###autoload (tramp-completion-run-real-handler operation args))
2110
2111(defun tramp-completion-file-name-handler (operation &rest args)
2109 "Invoke Tramp file name completion handler. 2112 "Invoke Tramp file name completion handler.
2110Falls back to normal file name handler if no Tramp file name handler exists." 2113Falls back to normal file name handler if no Tramp file name handler exists."
2111 (let ((fn (assoc operation tramp-completion-file-name-handler-alist))) 2114 (let ((fn (assoc operation tramp-completion-file-name-handler-alist)))
@@ -2127,7 +2130,7 @@ Falls back to normal file name handler if no Tramp file name handler exists."
2127 (featurep 'ido) 2130 (featurep 'ido)
2128 (featurep 'icicles))) 2131 (featurep 'icicles)))
2129 (save-match-data (apply (cdr fn) args)) 2132 (save-match-data (apply (cdr fn) args))
2130 (tramp-completion-run-real-handler operation args))))) 2133 (tramp-completion-run-real-handler operation args))))
2131 2134
2132;;;###autoload 2135;;;###autoload
2133(progn (defun tramp-autoload-file-name-handler (operation &rest args) 2136(progn (defun tramp-autoload-file-name-handler (operation &rest args)