Commit ad74a69e authored by Michael Albinus's avatar Michael Albinus
Browse files

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

tramp.el explicitely.  (Bug#7583)
parent 71d4c2a5
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>
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment