diff options
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/net/ange-ftp.el | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 63b44276b16..9842b405165 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -2,6 +2,8 @@ * net/ange-ftp.el (ange-ftp-insert-directory): Undo unintended part in last change. + (ange-ftp-insert-directory): Fix up the search for the case where + `file' is absolute. 2005-10-02 Romain Francoise <romain@orebokech.com> diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 8142e812b74..e3fd69924d4 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -4507,10 +4507,11 @@ NEWNAME should be the name to give the new compressed or uncompressed file.") (setq switches (substring switches 0 (match-beginning 0)))) (let* ((dirlist (ange-ftp-ls (or (file-name-directory file) ".") switches nil)) + (filename (file-name-nondirectory (directory-file-name file))) (case-fold-search nil)) ;; FIXME: This presumes a particular output format, which is ;; basically Unix. - (if (string-match (concat "^.+[^ ] " (regexp-quote file) + (if (string-match (concat "^.+[^ ] " (regexp-quote filename) "\\( -> .*\\)?[@/*=]?\n") dirlist) (match-string 0 dirlist) ""))))))) |