[Emacs-diffs] /srv/bzr/emacs/trunk r106195: * ido.el (ido-file-name-all-completions-1): Do not require

[Michael Albinus]

------------------------------------------------------------
revno: 106195
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Wed 2011-10-26 10:42:22 +0200
message:
  * ido.el (ido-file-name-all-completions-1): Do not require
  tramp.el explicitely.  (Bug#7583)
modified:
  lisp/ChangeLog
  lisp/ido.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-10-26 01:18:13 +0000
+++ b/lisp/ChangeLog    2011-10-26 08:42:22 +0000
@@ -1,3 +1,8 @@
+2011-10-26  Michael Albinus  <address@hidden>
+
+       * ido.el (ido-file-name-all-completions-1): Do not require
+       tramp.el explicitely.  (Bug#7583)
+
 2011-10-26  Stefan Monnier  <address@hidden>
 
        * progmodes/octave-mod.el:
@@ -10,7 +15,7 @@
 2011-10-25  Michael Albinus  <address@hidden>
 
        * 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  <address@hidden>
 

=== modified file 'lisp/ido.el'
--- a/lisp/ido.el       2011-10-19 12:54:24 +0000
+++ b/lisp/ido.el       2011-10-26 08:42:22 +0000
@@ -3457,8 +3457,6 @@
       (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 @@
    ;; 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.
@@ -3480,7 +3476,9 @@
                ;; /ftp:address@hidden:./ => 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)