[Emacs-diffs] master a8be7c1: Avoid recursive load of tramp.el

[Michael Albinus]

branch: master
commit a8be7c1ec40c9fab3407a0bc59e20141364e231f
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    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.
---
 lisp/net/tramp.el |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 6f30f39..41d67d4 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)