From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 12 May 2016 08:57:10 +0000 (+0200)
Subject: Avoid recursive load of tramp.el
X-Git-Tag: emacs-26.0.90~1957
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a8be7c1ec40c9fab3407a0bc59e20141364e231f;p=emacs.git

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.
---

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.")
 Together with `tramp-locked', this implements a locking mechanism
 preventing reentrant calls of Tramp.")
 
-;;;###autoload
-(progn (defun tramp-completion-file-name-handler (operation &rest args)
+;; Avoid recursive loading of tramp.el.
+;;;###autoload(defun tramp-completion-file-name-handler (operation &rest args)
+;;;###autoload  (tramp-completion-run-real-handler operation args))
+
+(defun tramp-completion-file-name-handler (operation &rest args)
   "Invoke Tramp file name completion handler.
 Falls back to normal file name handler if no Tramp file name handler exists."
   (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."
              (featurep 'ido)
              (featurep 'icicles)))
 	(save-match-data (apply (cdr fn) args))
-      (tramp-completion-run-real-handler operation args)))))
+      (tramp-completion-run-real-handler operation args))))
 
 ;;;###autoload
 (progn (defun tramp-autoload-file-name-handler (operation &rest args)