aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/ange-ftp.el1
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cc0fa8f3434..77b454ce760 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12002-08-27 Francesco Potorti` <pot@gnu.org>
2
3 * net/ange-ftp.el (ange-ftp-skip-msgs): Skip the 530 response
4 given by vsFTPd when accessed with a kerberised FTP client.
5
12002-08-27 Richard M. Stallman <rms@gnu.org> 62002-08-27 Richard M. Stallman <rms@gnu.org>
2 7
3 * files.el (find-alternate-file): 8 * files.el (find-alternate-file):
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index bd9a432af7d..010c7fe1838 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -728,6 +728,7 @@ parenthesized expressions in REGEXP for the components (in that order)."
728 "^Data connection \\|" 728 "^Data connection \\|"
729 "^local:\\|^Trying\\|^125 \\|^550-\\|^221 .*oodbye\\|" 729 "^local:\\|^Trying\\|^125 \\|^550-\\|^221 .*oodbye\\|"
730 "^500 .*AUTH \\(KERBEROS\\|GSSAPI\\)\\|^KERBEROS\\|" 730 "^500 .*AUTH \\(KERBEROS\\|GSSAPI\\)\\|^KERBEROS\\|"
731 "^530 Please login with USER and PASS\\|" ; non kerberised vsFTPd
731 "^22[789] .*[Pp]assive\\|^200 EPRT\\|^500 .*EPRT") 732 "^22[789] .*[Pp]assive\\|^200 EPRT\\|^500 .*EPRT")
732 "*Regular expression matching ftp messages that can be ignored." 733 "*Regular expression matching ftp messages that can be ignored."
733 :group 'ange-ftp 734 :group 'ange-ftp