2008-06-30 Tetsurou Okazaki <okazaki@be.to>

	* elmo-imap4.el (elmo-imap4-parse-status): Use `case' instead of `cond'.

2008-06-30  Don Bashford  <Don.Bashford@stjude.org>

	* elmo-imap4.el (elmo-imap4-parse-status): Accept IMAP4 tokens in a
	case-insensitive fashion.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 613d42a..4f7bb6a 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,12 @@
+2008-06-30  Tetsurou Okazaki  <okazaki@be.to>
+
+       * elmo-imap4.el (elmo-imap4-parse-status): Use `case' instead of `cond'.
+
+2008-06-30  Don Bashford  <Don.Bashford@stjude.org>
+
+       * elmo-imap4.el (elmo-imap4-parse-status): Accept IMAP4 tokens in a
+       case-insensitive fashion.
+
 2008-03-30  Tetsurou Okazaki  <okazaki@be.to>
 
        * elmo-imap4.el (elmo-imap4-send-command): Combine `process-send-string' calls.

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index f318675..0cc8e37 100644 (file)
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -1602,22 +1602,23 @@ Return nil if no complete line has arrived."
        (setq status
              (cons
               (let ((token (read (current-buffer))))
-                (cond ((eq token 'MESSAGES)
-                       (list 'messages (read (current-buffer))))
-                      ((eq token 'RECENT)
-                       (list 'recent (read (current-buffer))))
-                      ((eq token 'UIDNEXT)
-                       (list 'uidnext (read (current-buffer))))
-                      ((eq token 'UIDVALIDITY)
-                       (and (looking-at " \\([0-9]+\\)")
-                            (prog1 (list 'uidvalidity (match-string 1))
-                              (goto-char (match-end 1)))))
-                      ((eq token 'UNSEEN)
-                       (list 'unseen (read (current-buffer))))
-                      (t
-                       (message
-                        "Unknown status data %s in mailbox %s ignored"
-                        token mailbox))))
+                (case (intern (upcase (symbol-name token)))
+                  (MESSAGES
+                   (list 'messages (read (current-buffer))))
+                  (RECENT
+                   (list 'recent (read (current-buffer))))
+                  (UIDNEXT
+                   (list 'uidnext (read (current-buffer))))
+                  (UIDVALIDITY
+                   (and (looking-at " \\([0-9]+\\)")
+                        (prog1 (list 'uidvalidity (match-string 1))
+                          (goto-char (match-end 1)))))
+                  (UNSEEN
+                   (list 'unseen (read (current-buffer))))
+                  (t 
+                   (message
+                    "Unknown status data %s in mailbox %s ignored"
+                    token mailbox))))
               status))
        (skip-chars-forward " ")))
     (and elmo-imap4-status-callback