* ido.el (ido-file-name-all-completions-1): Do not require

tramp.el explicitely.  (Bug#7583)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 60f1db123cfcbef129cff2674ec6e6dc1a5c29ef..88248f00559b9ab28df550836a8788e3b7af4fec 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-26  Michael Albinus  <michael.albinus@gmx.de>
+
+       * ido.el (ido-file-name-all-completions-1): Do not require
+       tramp.el explicitely.  (Bug#7583)
+
 2011-10-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/octave-mod.el:
@@ -10,7 +15,7 @@
 2011-10-25  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp-sh.el (tramp-sh-handle-file-directory-p): Return t for
-       filenames "/method:foo:".
+       filenames "/method:foo:".  (Bug#9793)
 
 2011-10-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 

diff --git a/lisp/ido.el b/lisp/ido.el
index 88599013ce6e0fb703778a48e47c5e6241da42b8..fda4c0316f72e8f9056323cedff4b047c99fa0f3 100644 (file)
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -3457,8 +3457,6 @@ This is to make them appear as if they were \"virtual buffers\"."
       (nconc ido-temp-list items)
     (setq ido-temp-list items)))
 
-(declare-function tramp-tramp-file-p "tramp" (name))
-
 (defun ido-file-name-all-completions-1 (dir)
   (cond
    ((ido-nonreadable-directory-p dir) '())
@@ -3466,8 +3464,6 @@ This is to make them appear as if they were \"virtual buffers\"."
    ;; 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:user@host: part of tramp completions.
     ;; Tramp completions do not include leading slash.
@@ -3480,7 +3476,9 @@ This is to make them appear as if they were \"virtual buffers\"."
                ;; /ftp:user@host:./ => ok
                (and
                 (not (string= "/ftp:" dir))
-                (tramp-tramp-file-p dir)
+                (file-remote-p dir)
+                ;; tramp-ftp-file-name-p is available only when tramp
+                ;; has been loaded.
                 (fboundp 'tramp-ftp-file-name-p)
                 (funcall 'tramp-ftp-file-name-p dir)
                 (string-match ":\\'" dir)