* ido.el (ido-file-name-all-completions-1): Check for fboundp of

`tramp-completion-mode-p' as it is in Tramp 2.1.  Let-bind
`tramp-completion-mode'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6bf2aeee381d8b4e73183043b7fee7902a38327e..e685cf56091f3c45bce1f0a54d5e2341f10d18f6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-24  Michael Albinus  <michael.albinus@gmx.de>
+
+       * ido.el (ido-file-name-all-completions-1): Check for fboundp of
+       `tramp-completion-mode-p' as it is in Tramp 2.1.  Let-bind
+       `tramp-completion-mode'.
+
 2007-11-24  Thien-Thi Nguyen  <ttn@gnuvola.org>
 
        * vc-git.el (vc-git-show-log-entry): New func.

diff --git a/lisp/ido.el b/lisp/ido.el
index af8936b86d97ae3be4825287299f8ab28d07a344..3801934fc3ed73c7cdfb2cbc472a4de99785aa0d 100644 (file)
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -3373,24 +3373,25 @@ for first matching file."
    ;; Caller must have done that if necessary.
 
    ((and ido-enable-tramp-completion
-        (or (fboundp 'tramp-completion-mode)
+        (or (fboundp 'tramp-completion-mode-p)
             (require 'tramp nil t))
         (string-match "\\`/[^/]+[:@]\\'" dir))
     ;; Strip method:user@host: part of tramp completions.
     ;; Tramp completions do not include leading slash.
-    (let ((len (1- (length dir)))
-         (compl
-          (or (file-name-all-completions "" dir)
-              ;; work around bug in ange-ftp.
-              ;; /ftp:user@host: => nil
-              ;; /ftp:user@host:./ => ok
-              (and
-               (not (string= "/ftp:" dir))
-               (tramp-tramp-file-p dir)
-               (fboundp 'tramp-ftp-file-name-p)
-               (funcall 'tramp-ftp-file-name-p dir)
-               (string-match ":\\'" dir)
-               (file-name-all-completions "" (concat dir "./"))))))
+    (let* ((len (1- (length dir)))
+          (tramp-completion-mode t)
+          (compl
+           (or (file-name-all-completions "" dir)
+               ;; work around bug in ange-ftp.
+               ;; /ftp:user@host: => nil
+               ;; /ftp:user@host:./ => ok
+               (and
+                (not (string= "/ftp:" dir))
+                (tramp-tramp-file-p dir)
+                (fboundp 'tramp-ftp-file-name-p)
+                (funcall 'tramp-ftp-file-name-p dir)
+                (string-match ":\\'" dir)
+                (file-name-all-completions "" (concat dir "./"))))))
       (if (and compl
               (> (length (car compl)) len)
               (string= (substring (car compl) 0 len) (substring dir 1)))