Mercurial > emacs
changeset 107268:90dfa01009dd
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Tue, 02 Feb 2010 21:53:34 +0000 |
| parents | 848000087a55 (current diff) abe576120f76 (diff) |
| children | 19af79cef24d |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Feb 01 23:55:38 2010 +0000 +++ b/lisp/ChangeLog Tue Feb 02 21:53:34 2010 +0000 @@ -1,3 +1,8 @@ +2010-02-02 Michael Albinus <michael.albinus@gmx.de> + + * net/ange-ftp.el (ange-ftp-skip-msgs): Ignore all ""^500 .*AUTH" + messages. + 2010-02-01 Juri Linkov <juri@jurta.org> * arc-mode.el (archive-zip-extract): Use `member-ignore-case' to
--- a/lisp/net/ange-ftp.el Mon Feb 01 23:55:38 2010 +0000 +++ b/lisp/net/ange-ftp.el Tue Feb 02 21:53:34 2010 +0000 @@ -720,7 +720,7 @@ "^Connected \\|^$\\|^Remote system\\|^Using\\|^ \\|Password:\\|" "^Data connection \\|" "^local:\\|^Trying\\|^125 \\|^550-\\|^221 .*oodbye\\|" - "^500 .*AUTH \\(KERBEROS\\|GSSAPI\\)\\|^KERBEROS\\|" + "^500 .*AUTH\\|^KERBEROS\\|" "^530 Please login with USER and PASS\\|" ; non kerberised vsFTPd "^534 Kerberos Authentication not enabled\\|" "^22[789] .*[Pp]assive\\|^200 EPRT\\|^500 .*EPRT")