Mercurial > emacs

changeset 65791:5121212db622

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(ange-ftp-insert-directory): Fix up the search when `file' is absolute.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sun, 02 Oct 2005 15:54:03 +0000
parents 2eea5cbe306f
children 8c8e6f2eea3c
files lisp/ChangeLog lisp/net/ange-ftp.el
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sun Oct 02 15:38:20 2005 +0000
+++ b/lisp/ChangeLog	Sun Oct 02 15:54:03 2005 +0000
@@ -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>
 
--- a/lisp/net/ange-ftp.el	Sun Oct 02 15:38:20 2005 +0000
+++ b/lisp/net/ange-ftp.el	Sun Oct 02 15:54:03 2005 +0000
@@ -4507,10 +4507,11 @@
          (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)
            "")))))))