diff options
| author | Richard M. Stallman <rms@gnu.org> | 1993-12-23 03:05:12 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1993-12-23 03:05:12 +0000 |
| commit | d1d6014aac1d0a3b452035cf723bf5a6572849b5 (patch) | |
| tree | f7d445f391ef8a29a6fbd10ffdffeb49af75b29f | |
| parent | b59657535d9d24e1cf425459238600a6cf575065 (diff) | |
| download | emacs-d1d6014aac1d0a3b452035cf723bf5a6572849b5.tar.gz | |
(ange-ftp-hash-mark-msgs): Make match more general.
(ange-ftp-gateway-prompt-pattern): Don't match more than one line.
| -rw-r--r-- | lisp/ange-ftp.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ange-ftp.el b/lisp/ange-ftp.el index 099d60660f3..8ed9ae6c0b4 100644 --- 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) |