* net/tramp.el (tramp-register-file-name-handlers): Enable Tramp

completion also when ido is loaded.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 22b93e2e079874b7aa1357bb0ecc8aa1d1150a25..a8ba7ded3f148531fc77efbf5ae96dd6869aa99a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-09  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp.el (tramp-register-file-name-handlers): Enable Tramp
+       completion also when ido is loaded.
+
 2006-05-09  Masatake YAMATO  <jet@gyve.org>
 
        * font-lock.el (cpp-font-lock-keywords-source-directives): Addded

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 6e166aa23936317ccdf3b1b62544b6f513537adf..2ebc4d0b45eaf4e6c662b3a9db39fc3fc85e5821 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4331,7 +4331,7 @@ Falls back to normal file name handler if no tramp file name handler exists."
   "Add tramp file name handlers to `file-name-handler-alist'."
   (add-to-list 'file-name-handler-alist
               (cons tramp-file-name-regexp 'tramp-file-name-handler))
-  (when partial-completion-mode
+  (when (or partial-completion-mode (featurep 'ido))
     (add-to-list 'file-name-handler-alist
                 (cons tramp-completion-file-name-regexp
                       'tramp-completion-file-name-handler))