* elmo-util.el (elmo-unintern): New macro.

(elmo-number-set-member): Fixed docstring.

* elmo-imap4.el (elmo-imap4-parse-response): Call `elmo-unintern' for
 tag token.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index ad26b11..599313f 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,11 @@
+2000-10-26  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * elmo-util.el (elmo-unintern): New macro.
+       (elmo-number-set-member): Fixed docstring.
+
+       * elmo-imap4.el (elmo-imap4-parse-response): Call `elmo-unintern' for
+       tag token.
+
 2000-10-25  OKAZAKI Tetsurou  <okazaki@be.to>
 
        * elmo-imap4.el (elmo-imap4-client-eol): Remove duplicated defvar

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index 44003a7..7328dc5 100644 (file)
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -1693,11 +1693,15 @@ Return nil if no complete line has arrived."
                   (elmo-imap4-forward))
             (OK  (progn
                    (setq elmo-imap4-parsing nil)
+                   (setq token (symbol-name token))
+                   (elmo-unintern token)
                    (elmo-imap4-debug "*%s* OK arrived" token)
                    (setq elmo-imap4-reached-tag token)
                    (list 'ok (elmo-imap4-parse-resp-text-code))))
             (NO  (progn
                    (setq elmo-imap4-parsing nil)
+                   (setq token (symbol-name token))
+                   (elmo-unintern token)
                    (elmo-imap4-debug "*%s* NO arrived" token)
                    (setq elmo-imap4-reached-tag token)
                    (let (code text)
@@ -1710,6 +1714,8 @@ Return nil if no complete line has arrived."
             (BAD (progn
                    (setq elmo-imap4-parsing nil)
                    (elmo-imap4-debug "*%s* BAD arrived" token)
+                   (setq token (symbol-name token))
+                   (elmo-unintern token)
                    (setq elmo-imap4-reached-tag token)
                    (let (code text)
                      (when (eq (char-after (point)) ?\[)
@@ -1847,9 +1853,7 @@ Return nil if no complete line has arrived."
                       (list 'bodystructure (elmo-imap4-parse-body)))))
          (setq list (cons element list))))
       (and elmo-imap4-fetch-callback
-          (elmo-imap4-fetch-callback
-           list
-           elmo-imap4-fetch-callback-data))
+          (elmo-imap4-fetch-callback list elmo-imap4-fetch-callback-data))
       (list 'fetch list))))
 
 (defun elmo-imap4-parse-status ()

diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index bc76b31..3216644 100644 (file)
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -1326,6 +1326,11 @@ Otherwise treat \\ in NEWTEXT string as special:
       (list 'unintern string hashtable)
     (list 'makunbound (list 'intern string hashtable))))
 
+(defmacro elmo-unintern (string)
+  ;; Emacs 19.28 or earlier does not have unintern.
+  (static-if (fboundp 'unintern)
+      (list 'unintern string)))
+
 ;; Make a hash table (default and minimum size is 1024).
 (defun elmo-make-hash (&optional hashsize)
   (make-vector
@@ -1632,7 +1637,7 @@ But if optional argument AUTO is non-nil, DEFAULT is returned."
 
 (defun elmo-number-set-member (number number-set)
   "Return non-nil if NUMBER is an element of NUMBER-SET.
-The value is actuall the tail of SET-LIST whose car contains NUMBER."
+The value is actually the tail of NUMBER-RANGE whose car contains NUMBER."
   (or (memq number number-set)
       (let (found)
        (while (and number-set (not found))