mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

* net/ange-ftp.el (ange-ftp-file-name-completion): Handle optional

Browse source 
parameter PREDICATE.

* lisp/tramp.el (tramp-handle-file-name-completion)
(tramp-completion-handle-file-name-completion): Handle optional
parameter PREDICATE.
(tramp-find-default-method): Add code for default values.
This commit is contained in:
Michael Albinus 2006-12-20 05:57:41 +00:00
parent 82bc67b8b2
commit e1e17cae49
3 changed files with 30 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lisp/ChangeLog
View file

@ -1,3 +1,13 @@
2006-12-20 Michael Albinus <michael.albinus@gmx.de>
* net/ange-ftp.el (ange-ftp-file-name-completion): Handle optional
parameter PREDICATE.
* lisp/tramp.el (tramp-handle-file-name-completion)
(tramp-completion-handle-file-name-completion): Handle optional
parameter PREDICATE.
(tramp-find-default-method): Add code for default values.
2006-12-20 Nick Roberts <nickrob@snap.net.nz>
* progmodes/gdb-ui.el (gdb-stopped): After attaching to a process

11
lisp/net/ange-ftp.el
View file

@ -3977,7 +3977,7 @@ E.g.,
ange-ftp-this-dir))
(ange-ftp-real-file-name-all-completions file ange-ftp-this-dir)))))
(defun ange-ftp-file-name-completion (file dir)
(defun ange-ftp-file-name-completion (file dir &optional predicate)
(let ((ange-ftp-this-dir (expand-file-name dir)))
(if (ange-ftp-ftp-name ange-ftp-this-dir)
(progn
@ -4005,8 +4005,13 @@ E.g.,
file
(nconc (ange-ftp-generate-root-prefixes)
(ange-ftp-real-file-name-all-completions
file ange-ftp-this-dir)))
(ange-ftp-real-file-name-completion file ange-ftp-this-dir)))))
file ange-ftp-this-dir))
predicate)
(if predicate
(ange-ftp-real-file-name-completion
file ange-ftp-this-dir predicate)
(ange-ftp-real-file-name-completion
file ange-ftp-this-dir))))))
(defun ange-ftp-file-name-completion-1 (file tbl dir &optional predicate)

19
lisp/net/tramp.el
View file

@ -2856,7 +2856,8 @@ of."
;; The following isn't needed for Emacs 20 but for 19.34?
(defun tramp-handle-file-name-completion (filename directory)
(defun tramp-handle-file-name-completion
(filename directory &optional predicate)
"Like `file-name-completion' for tramp files."
(unless (tramp-tramp-file-p directory)
(error
@ -2866,7 +2867,8 @@ of."
(try-completion
filename
(mapcar (lambda (x) (cons x nil))
(file-name-all-completions filename directory)))))
(file-name-all-completions filename directory))
predicate)))
;; cp, mv and ln
@ -4627,10 +4629,13 @@ Falls back to normal file name handler if no tramp file name handler exists."
;; Method, host name and user name completion for a file.
;;;###autoload
(defun tramp-completion-handle-file-name-completion (filename directory)
(defun tramp-completion-handle-file-name-completion
(filename directory &optional predicate)
"Like `file-name-completion' for tramp files."
(try-completion filename
(mapcar 'list (file-name-all-completions filename directory))))
(try-completion
filename
(mapcar 'list (file-name-all-completions filename directory))
predicate))
;; I misuse a little bit the tramp-file-name structure in order to handle
;; completion possibilities for partial methods / user names / host names.
@ -6965,8 +6970,8 @@ localname (file name on remote host)."
item)
(while choices
(setq item (pop choices))
(when (and (string-match (nth 0 item) (or host ""))
(string-match (nth 1 item) (or user "")))
(when (and (string-match (or (nth 0 item) "") (or host ""))
(string-match (or (nth 1 item) "") (or user "")))
(setq method (nth 2 item))
(setq choices nil)))
method))