(ange-ftp-hash-mark-msgs): Make match more general.

(ange-ftp-gateway-prompt-pattern): Don't match more than one line.

diff --git a/lisp/ange-ftp.el b/lisp/ange-ftp.el
index 099d60660f3f46e21799c6bf9aba6ac16f63374c..8ed9ae6c0b442cf60f9a264c069c97c4c8ee338f 100644 (file)
--- a/lisp/ange-ftp.el
+++ b/lisp/ange-ftp.el
@@ -729,7 +729,7 @@ like this.")
 are rsh (remsh on hp-ux), telnet and rlogin.  See also the gateway variable
 above.")
 
-(defvar ange-ftp-gateway-prompt-pattern "^[^#$%>;]*[#$%>;] *"
+(defvar ange-ftp-gateway-prompt-pattern "^[^#$%>;\n]*[#$%>;] *"
   "*Regexp used to detect that the logging-in sequence is completed on the
 gateway machine and that the shell is now awaiting input.  Make this regexp as
 strict as possible; it shouldn't match *anything* at all except the user's
@@ -857,7 +857,7 @@ SIZE, if supplied, should be a prime number."
 ;;;; Internal variables.
 ;;;; ------------------------------------------------------------
 
-(defconst ange-ftp-version "$Revision: 1.36 $")
+(defconst ange-ftp-version "$Revision: 1.37 $")
 
 (defvar ange-ftp-data-buffer-name " *ftp data*"
   "Buffer name to hold directory listing data received from ftp process.")
@@ -1851,7 +1851,7 @@ PROC is the process to the FTP-client."
                                  (cdr result)))))))
 
 (defvar ange-ftp-hash-mark-msgs
-  "[hH]ash mark [^0-9]*\\([0-9]+\\)"
+  "[hH]ash mark \\(printing on \\)?(?[^0-9]*\\([0-9]+\\)"
   "*Regexp matching the FTP client's output upon doing a HASH command.")
 
 (defun ange-ftp-guess-hash-mark-size (proc)