*** /home/albinus/src/emacs/lisp/ido.el.~1.137.~	2007-11-19 19:42:15.000000000 +0100
--- /home/albinus/src/emacs/lisp/ido.el	2007-11-22 22:34:14.000000000 +0100
***************
*** 3373,3396 ****
     ;; Caller must have done that if necessary.
  
     ((and ido-enable-tramp-completion
! 	 (or (fboundp 'tramp-completion-mode)
  	     (require 'tramp nil t))
  	 (string-match "\\`/[^/]+[:@]\\'" dir))
      ;; Strip method:address@hidden: 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:address@hidden: => nil
! 	       ;; /ftp:address@hidden:./ => 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)))
--- 3373,3397 ----
     ;; Caller must have done that if necessary.
  
     ((and ido-enable-tramp-completion
! 	 (or (fboundp 'tramp-completion-mode-p)
  	     (require 'tramp nil t))
  	 (string-match "\\`/[^/]+[:@]\\'" dir))
      ;; Strip method:address@hidden: part of tramp completions.
      ;; Tramp completions do not include leading slash.
!     (let* ((len (1- (length dir)))
! 	   (tramp-completion-mode t)
! 	   (compl
! 	    (or (file-name-all-completions "" dir)
! 		;; work around bug in ange-ftp.
! 		;; /ftp:address@hidden: => nil
! 		;; /ftp:address@hidden:./ => 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)))