aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2010-09-21 10:35:18 +0200
committerMichael Albinus2010-09-21 10:35:18 +0200
commitb0f037ed888772b7ef698c2ad5ddedf1bd7296b1 (patch)
tree8381d686abaa43bc86c119801fcc1a54c50bd6d5
parent180fb94ac339f547525f64628eca4079bb0a0d7d (diff)
downloademacs-b0f037ed888772b7ef698c2ad5ddedf1bd7296b1.tar.gz
emacs-b0f037ed888772b7ef698c2ad5ddedf1bd7296b1.zip
* net/ange-ftp.el (ange-ftp-skip-msgs): Add "^504 ..." message.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/ange-ftp.el1
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 @@
12010-09-21 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/ange-ftp.el (ange-ftp-skip-msgs): Add "^504 ..." message.
4
12010-09-21 Jan Djärv <jan.h.d@swipnet.se> 52010-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")