mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
`tramp-completion-mode-p' as it is in Tramp 2.1.  Let-bind
`tramp-completion-mode'.
This commit is contained in:
Michael Albinus 2007-11-24 15:40:09 +00:00
parent 95ec6ea4b9
commit d9e43b70c6
2 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -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.

29
lisp/ido.el
View file

@ -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)))