From: Michael Albinus <michael.albinus@gmx.de>
Date: Tue, 9 May 2006 04:26:23 +0000 (+0000)
Subject: * net/tramp.el (tramp-register-file-name-handlers): Enable Tramp
X-Git-Tag: emacs-pretest-22.0.90~2673
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b5bbf8f27d22c4036006edd64ae35398e4107737;p=emacs.git

* 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 22b93e2e079..a8ba7ded3f1 100644
--- 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 6e166aa2393..2ebc4d0b45e 100644
--- 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))