From: Michael Albinus Date: Tue, 21 Sep 2010 08:35:18 +0000 (+0200) Subject: * net/ange-ftp.el (ange-ftp-skip-msgs): Add "^504 ..." message. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~47^2~48 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b0f037ed888772b7ef698c2ad5ddedf1bd7296b1;p=emacs.git * net/ange-ftp.el (ange-ftp-skip-msgs): Add "^504 ..." message. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 275bee9fa19..e293d7612ba 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-09-21 Michael Albinus + + * net/ange-ftp.el (ange-ftp-skip-msgs): Add "^504 ..." message. + 2010-09-21 Jan Djärv * menu-bar.el (menu-bar-set-tool-bar-position): customize-set-variable diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index dcc6ddabcdc..4b63dfd7535 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -722,6 +722,7 @@ parenthesized expressions in REGEXP for the components (in that order)." "^Data connection \\|" "^local:\\|^Trying\\|^125 \\|^550-\\|^221 .*oodbye\\|" "^500 .*AUTH\\|^KERBEROS\\|" + "^504 Unknown security mechanism\\|" "^530 Please login with USER and PASS\\|" ; non kerberised vsFTPd "^534 Kerberos Authentication not enabled\\|" "^22[789] .*[Pp]assive\\|^200 EPRT\\|^500 .*EPRT")