From: Michael Albinus Date: Tue, 2 Feb 2010 11:19:36 +0000 (+0100) Subject: * net/ange-ftp.el (ange-ftp-skip-msgs): Ignore all ""^500 .*AUTH" X-Git-Tag: emacs-pretest-23.1.93~124 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c35fcd52222a74cbb94b97f1e169aabd79e97417;p=emacs.git * net/ange-ftp.el (ange-ftp-skip-msgs): Ignore all ""^500 .*AUTH" messages. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b3de5b8baed..2f9b8510350 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-02-02 Michael Albinus + + * net/ange-ftp.el (ange-ftp-skip-msgs): Ignore all ""^500 .*AUTH" + messages. + 2010-02-01 Juri Linkov * arc-mode.el (archive-zip-extract): Use `member-ignore-case' to diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 98a3f557595..d443532ce2a 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -720,7 +720,7 @@ parenthesized expressions in REGEXP for the components (in that order)." "^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")