From ac7d41c1dfac6f8a34afe100243fe5911c0971a2 Mon Sep 17 00:00:00 2001 From: teranisi Date: Fri, 1 Sep 2000 00:37:02 +0000 Subject: [PATCH] * elmo-imap4.el (elmo-imap4-parse-response): Use string-match for garbage checking. --- elmo/ChangeLog | 5 +++++ elmo/elmo-imap4.el | 9 +++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index ae89601..c0b493d 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,3 +1,8 @@ +2000-09-01 Yuuichi Teranishi + + * elmo-imap4.el (elmo-imap4-parse-response): Use string-match for + garbage checking. + 2000-08-31 Yuuichi Teranishi * elmo-imap4.el (elmo-imap4-send-command): diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el index 9f9dfc0..b8c7bbc 100644 --- a/elmo/elmo-imap4.el +++ b/elmo/elmo-imap4.el @@ -250,8 +250,7 @@ Returns a TAG string which is assigned to the COMAND." (goto-char (point-min)) (if (elmo-imap4-response-bye-p elmo-imap4-current-response) (signal 'elmo-imap4-bye-error - (list - (elmo-imap4-response-error-text response)))) + (list (elmo-imap4-response-error-text response)))) (setq elmo-imap4-current-response nil) (if elmo-imap4-parsing (error "IMAP process is running. Please wait (or plug again.)")) @@ -1603,10 +1602,8 @@ Return nil if no complete line has arrived." (EXPUNGE (list 'expunge t)) (FETCH (elmo-imap4-parse-fetch token)) (t (list 'garbage (buffer-string))))))) - (t (if (not (string= token - (concat elmo-imap4-seq-prefix - (number-to-string elmo-imap4-seqno)))) - (message "Garbage token(%s): %s" token (buffer-string)) + (t (if (not (string-match elmo-imap4-seq-prefix (symbol-name token))) + (list 'garbage (buffer-string)) (case (prog1 (elmo-imap4-read (current-buffer)) (elmo-imap4-forward)) (OK (progn -- 1.7.10.4