aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2009-03-24 16:11:00 +0000
committerMichael Albinus2009-03-24 16:11:00 +0000
commit8204704e3cdfe43631d73a7c32f71c7d81d70f4f (patch)
tree71ebe22ad7d058cd580366b08c2136cfba1a30d2
parent58aec0d679ff3c5f56ea384702f9a23fecccfe33 (diff)
downloademacs-8204704e3cdfe43631d73a7c32f71c7d81d70f4f.tar.gz
emacs-8204704e3cdfe43631d73a7c32f71c7d81d70f4f.zip
* net/ange-ftp.el (ange-ftp-skip-msgs): Add 534.
-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 886df2dd745..0cd63d7dec7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12009-03-24 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/ange-ftp.el (ange-ftp-skip-msgs): Add 534.
4
12009-03-24 Glenn Morris <rgm@gnu.org> 52009-03-24 Glenn Morris <rgm@gnu.org>
2 6
3 * wid-edit.el (widget-specify-field): Don't add a second overlay for a 7 * wid-edit.el (widget-specify-field): Don't add a second overlay for a
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index c0f8c8eccd2..923deee68a8 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -727,6 +727,7 @@ parenthesized expressions in REGEXP for the components (in that order)."
727 "^local:\\|^Trying\\|^125 \\|^550-\\|^221 .*oodbye\\|" 727 "^local:\\|^Trying\\|^125 \\|^550-\\|^221 .*oodbye\\|"
728 "^500 .*AUTH \\(KERBEROS\\|GSSAPI\\)\\|^KERBEROS\\|" 728 "^500 .*AUTH \\(KERBEROS\\|GSSAPI\\)\\|^KERBEROS\\|"
729 "^530 Please login with USER and PASS\\|" ; non kerberised vsFTPd 729 "^530 Please login with USER and PASS\\|" ; non kerberised vsFTPd
730 "^534 Kerberos Authentication not enabled\\|"
730 "^22[789] .*[Pp]assive\\|^200 EPRT\\|^500 .*EPRT") 731 "^22[789] .*[Pp]assive\\|^200 EPRT\\|^500 .*EPRT")
731 "Regular expression matching FTP messages that can be ignored." 732 "Regular expression matching FTP messages that can be ignored."
732 :group 'ange-ftp 733 :group 'ange-ftp