diff options
| author | Stefan Monnier | 2005-10-02 15:54:03 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2005-10-02 15:54:03 +0000 |
| commit | edb18c43df867f09ffff9841482900fd9267abd4 (patch) | |
| tree | 7da487edeb6eba8c2ba21de2fb7c45d3bc653a06 | |
| parent | 402893bb42d63da7d63b0ada348d7797baf96201 (diff) | |
| download | emacs-edb18c43df867f09ffff9841482900fd9267abd4.tar.gz emacs-edb18c43df867f09ffff9841482900fd9267abd4.zip | |
(ange-ftp-insert-directory): Fix up the search when `file' is absolute.
| -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 @@ | |||
| 2 | 2 | ||
| 3 | * net/ange-ftp.el (ange-ftp-insert-directory): Undo unintended part | 3 | * net/ange-ftp.el (ange-ftp-insert-directory): Undo unintended part |
| 4 | in last change. | 4 | in last change. |
| 5 | (ange-ftp-insert-directory): Fix up the search for the case where | ||
| 6 | `file' is absolute. | ||
| 5 | 7 | ||
| 6 | 2005-10-02 Romain Francoise <romain@orebokech.com> | 8 | 2005-10-02 Romain Francoise <romain@orebokech.com> |
| 7 | 9 | ||
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.") | |||
| 4507 | (setq switches (substring switches 0 (match-beginning 0)))) | 4507 | (setq switches (substring switches 0 (match-beginning 0)))) |
| 4508 | (let* ((dirlist (ange-ftp-ls (or (file-name-directory file) ".") | 4508 | (let* ((dirlist (ange-ftp-ls (or (file-name-directory file) ".") |
| 4509 | switches nil)) | 4509 | switches nil)) |
| 4510 | (filename (file-name-nondirectory (directory-file-name file))) | ||
| 4510 | (case-fold-search nil)) | 4511 | (case-fold-search nil)) |
| 4511 | ;; FIXME: This presumes a particular output format, which is | 4512 | ;; FIXME: This presumes a particular output format, which is |
| 4512 | ;; basically Unix. | 4513 | ;; basically Unix. |
| 4513 | (if (string-match (concat "^.+[^ ] " (regexp-quote file) | 4514 | (if (string-match (concat "^.+[^ ] " (regexp-quote filename) |
| 4514 | "\\( -> .*\\)?[@/*=]?\n") dirlist) | 4515 | "\\( -> .*\\)?[@/*=]?\n") dirlist) |
| 4515 | (match-string 0 dirlist) | 4516 | (match-string 0 dirlist) |
| 4516 | ""))))))) | 4517 | ""))))))) |