diff options
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/ChangeLog | 5 | ||||
-rw-r--r-- | lisp/net/tramp.el | 2 |
2 files changed, 6 insertions, 1 deletions
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)) |