diff options
| author | Sam Steingold <sds@gnu.org> | 2000-07-28 16:27:41 +0000 |
|---|---|---|
| committer | Sam Steingold <sds@gnu.org> | 2000-07-28 16:27:41 +0000 |
| commit | 9d45313983c286609b81969c0babe73c4059b3a9 (patch) | |
| tree | 2a57b254d36e3dc78f74760a2d5d976672355a66 /lisp/net | |
| parent | 4a7f48bb2fe5e672118f29283c14c7330f9fb1cd (diff) | |
| download | emacs-9d45313983c286609b81969c0babe73c4059b3a9.tar.gz | |
Ange-ftp handles the output of the w32-style clients
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/ange-ftp.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index e710540f785..d02f0577c45 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -2487,6 +2487,10 @@ away in the internal cache." (format "list data file %s not readable" temp)))) + ;; remove ^M inserted by the win32 ftp client + (while (re-search-forward "\r$" nil t) + (replace-match "")) + (goto-char 1) (run-hooks 'ange-ftp-before-parse-ls-hook) (if parse (ange-ftp-set-files @@ -3428,7 +3432,7 @@ system TYPE.") (let ((file-mdtm (ange-ftp-file-modtime name)) (buf-mdtm (with-current-buffer buf (visited-file-modtime)))) (or (zerop (car file-mdtm)) - (< (float-time file-mdtm) (float-time buf-mdtm)))) + (<= (float-time file-mdtm) (float-time buf-mdtm)))) (ange-ftp-real-verify-visited-file-modtime buf)))) ;;;; ------------------------------------------------------------ |