Mercurial > emacs
changeset 30518:ba9bd1bf0ef8
Ange-ftp handles the output of the w32-style clients
| author | Sam Steingold <sds@gnu.org> |
|---|---|
| date | Fri, 28 Jul 2000 16:27:41 +0000 |
| parents | 9362643130ae |
| children | d732477f0678 |
| files | etc/NEWS lisp/ChangeLog lisp/net/ange-ftp.el |
| diffstat | 3 files changed, 14 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/NEWS Fri Jul 28 12:48:04 2000 +0000 +++ b/etc/NEWS Fri Jul 28 16:27:41 2000 +0000 @@ -975,6 +975,9 @@ *** If the new user-option `ange-ftp-try-passive-mode' is set, passive ftp mode will be used if the ftp client supports that. +*** Ange-ftp handles the output of the w32-style clients which +output ^M at the end of lines. + ** Shell script mode changes. Shell script mode (sh-script) can now indent scripts for shells
--- a/lisp/ChangeLog Fri Jul 28 12:48:04 2000 +0000 +++ b/lisp/ChangeLog Fri Jul 28 16:27:41 2000 +0000 @@ -1,3 +1,9 @@ +2000-07-28 Sam Steingold <sds@gnu.org> + + * net/ange-ftp.el (ange-ftp-verify-visited-file-modtime): + use `<=', not `<' to compare times! + (ange-ftp-ls): remve + 2000-07-27 Gerd Moellmann <gerd@gnu.org> * play/cookie1.el: Add explanation of how to make cookie.el
--- a/lisp/net/ange-ftp.el Fri Jul 28 12:48:04 2000 +0000 +++ b/lisp/net/ange-ftp.el Fri Jul 28 16:27:41 2000 +0000 @@ -2487,6 +2487,10 @@ (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 @@ (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)))) ;;;; ------------------------------------------------------------