diff options
| author | Richard M. Stallman | 1994-10-23 04:55:35 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1994-10-23 04:55:35 +0000 |
| commit | 13d9a3a96f21d3feff3e18f8b0321f6a13160cba (patch) | |
| tree | 6ddb1f42469556122937990f5c6ae674f015aa15 | |
| parent | 0fd8a324e2463f413e76ee329d4218d96450a26e (diff) | |
| download | emacs-13d9a3a96f21d3feff3e18f8b0321f6a13160cba.tar.gz emacs-13d9a3a96f21d3feff3e18f8b0321f6a13160cba.zip | |
(ange-ftp-process-handle-line): Check for a
multi-line message before an error message. Fixes problem of
thinking there is an error in narrative text.
| -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 ecb56f2072f..869726e3bc9 100644 --- a/lisp/ange-ftp.el +++ b/lisp/ange-ftp.el | |||
| @@ -860,7 +860,7 @@ SIZE, if supplied, should be a prime number." | |||
| 860 | ;;;; Internal variables. | 860 | ;;;; Internal variables. |
| 861 | ;;;; ------------------------------------------------------------ | 861 | ;;;; ------------------------------------------------------------ |
| 862 | 862 | ||
| 863 | (defconst ange-ftp-version "$Revision: 1.57 $") | 863 | (defconst ange-ftp-version "$Revision: 1.58 $") |
| 864 | 864 | ||
| 865 | (defvar ange-ftp-data-buffer-name " *ftp data*" | 865 | (defvar ange-ftp-data-buffer-name " *ftp data*" |
| 866 | "Buffer name to hold directory listing data received from ftp process.") | 866 | "Buffer name to hold directory listing data received from ftp process.") |
| @@ -1406,12 +1406,12 @@ good, skip, fatal, or unknown." | |||
| 1406 | (setq ange-ftp-process-busy nil | 1406 | (setq ange-ftp-process-busy nil |
| 1407 | ange-ftp-process-result t | 1407 | ange-ftp-process-result t |
| 1408 | ange-ftp-process-result-line line)) | 1408 | ange-ftp-process-result-line line)) |
| 1409 | ((string-match ange-ftp-multi-msgs line) | ||
| 1410 | (setq ange-ftp-process-multi-skip t)) | ||
| 1409 | ((string-match ange-ftp-fatal-msgs line) | 1411 | ((string-match ange-ftp-fatal-msgs line) |
| 1410 | (delete-process proc) | 1412 | (delete-process proc) |
| 1411 | (setq ange-ftp-process-busy nil | 1413 | (setq ange-ftp-process-busy nil |
| 1412 | ange-ftp-process-result-line line)) | 1414 | ange-ftp-process-result-line line)) |
| 1413 | ((string-match ange-ftp-multi-msgs line) | ||
| 1414 | (setq ange-ftp-process-multi-skip t)) | ||
| 1415 | (ange-ftp-process-multi-skip | 1415 | (ange-ftp-process-multi-skip |
| 1416 | t) | 1416 | t) |
| 1417 | (t | 1417 | (t |