diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/net/ange-ftp.el | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 275bee9fa19..e293d7612ba 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-09-21 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/ange-ftp.el (ange-ftp-skip-msgs): Add "^504 ..." message. | ||
| 4 | |||
| 1 | 2010-09-21 Jan Djärv <jan.h.d@swipnet.se> | 5 | 2010-09-21 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 6 | ||
| 3 | * menu-bar.el (menu-bar-set-tool-bar-position): customize-set-variable | 7 | * 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)." | |||
| 722 | "^Data connection \\|" | 722 | "^Data connection \\|" |
| 723 | "^local:\\|^Trying\\|^125 \\|^550-\\|^221 .*oodbye\\|" | 723 | "^local:\\|^Trying\\|^125 \\|^550-\\|^221 .*oodbye\\|" |
| 724 | "^500 .*AUTH\\|^KERBEROS\\|" | 724 | "^500 .*AUTH\\|^KERBEROS\\|" |
| 725 | "^504 Unknown security mechanism\\|" | ||
| 725 | "^530 Please login with USER and PASS\\|" ; non kerberised vsFTPd | 726 | "^530 Please login with USER and PASS\\|" ; non kerberised vsFTPd |
| 726 | "^534 Kerberos Authentication not enabled\\|" | 727 | "^534 Kerberos Authentication not enabled\\|" |
| 727 | "^22[789] .*[Pp]assive\\|^200 EPRT\\|^500 .*EPRT") | 728 | "^22[789] .*[Pp]assive\\|^200 EPRT\\|^500 .*EPRT") |