* elmo-pop3.el (elmo-pop3-lock): New buffer local variable.

[elisp/wanderlust.git] / elmo / elmo-pop3.el

diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index 47475e5..acf13cc 100644 (file)
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -54,13 +54,15 @@
 (defvar elmo-pop3-size-hash nil) ; number -> size
 (defvar elmo-pop3-uidl-done nil)
 (defvar elmo-pop3-list-done nil)
+(defvar elmo-pop3-lock nil)
 
 (defvar elmo-pop3-local-variables '(elmo-pop3-read-point
                                    elmo-pop3-uidl-number-hash
                                    elmo-pop3-number-uidl-hash
                                    elmo-pop3-uidl-done
                                    elmo-pop3-size-hash
-                                   elmo-pop3-list-done))
+                                   elmo-pop3-list-done
+                                   elmo-pop3-lock))
 
 (luna-define-method elmo-network-close-session ((session elmo-pop3-session))
   (when (elmo-network-session-process-internal session)
@@ -93,6 +95,7 @@
       (erase-buffer))
     (goto-char (point-min))
     (setq elmo-pop3-read-point (point))
+    (elmo-pop3-lock)
     (process-send-string process command)
     (process-send-string process "\r\n")))
 
@@ -133,6 +136,7 @@
                      (concat return-value "\n" response-string)
                    response-string)))
          (setq elmo-pop3-read-point match-end)))
+      (elmo-pop3-unlock)
       return-value)))
 
 (defun elmo-pop3-process-filter (process output)
@@ -323,8 +327,7 @@
        (elmo-pop3-parse-uidl-response response)))))
 
 (defun elmo-pop3-read-contents (buffer process)
-  (save-excursion
-    (set-buffer buffer)
+  (with-current-buffer buffer
     (let ((case-fold-search nil)
          match-end)
       (goto-char elmo-pop3-read-point)
@@ -332,6 +335,7 @@
        (accept-process-output process)
        (goto-char elmo-pop3-read-point))
       (setq match-end (point))
+      (elmo-pop3-unlock)
       (elmo-delete-cr
        (buffer-substring elmo-pop3-read-point
                         (- match-end 3))))))
@@ -480,6 +484,19 @@
       nil))
    (t
     nil)))
+
+(defun elmo-pop3-lock ()
+  "Lock pop3 process."
+  (setq elmo-pop3-lock t))
+
+(defun elmo-pop3-unlock ()
+  "Unlock pop3 process."
+  (setq elmo-pop3-lock nil))
+
+(defun elmo-pop3-locked-p (process)
+  "Return t if pop3 PROCESS is locked."
+  (with-current-buffer (process-buffer process)
+    elmo-pop3-lock))
      
 (defun elmo-pop3-retrieve-headers (buffer tobuffer process articles)
   (save-excursion
@@ -713,7 +730,12 @@
        (elmo-pop3-send-command process
                                (format "retr %s" number))
        (setq elmo-pop3-total-size size)
-       (message "Retrieving...")
+       (unless elmo-inhibit-display-retrieval-progress
+         (setq elmo-pop3-total-size size)
+         (elmo-display-progress
+          'elmo-pop3-display-retrieval-progress
+          (format "Retrieving (0/%d bytes)..." elmo-pop3-total-size)
+          0))
        (unwind-protect
            (progn
              (when (null (setq response (elmo-pop3-read-response
@@ -721,7 +743,10 @@
                (error "Fetching message failed"))
              (setq response (elmo-pop3-read-body process outbuf)))
          (setq elmo-pop3-total-size nil))
-       (message "Retrieving...done.")
+       (unless elmo-inhibit-display-retrieval-progress
+         (elmo-display-progress
+          'elmo-display-retrieval-progress "" 100)  ; remove progress bar.
+         (message "Retrieving...done."))
        (set-buffer outbuf)
        (goto-char (point-min))
        (while (re-search-forward "^\\." nil t)
@@ -797,8 +822,10 @@
 (defun elmo-pop3-commit (spec)
   (if (elmo-pop3-plugged-p spec)
       (let ((session (elmo-pop3-get-session spec 'if-exists)))
-       (and session
-            (elmo-network-close-session session)))))
+       (when (and session
+                  (not (elmo-pop3-locked-p
+                        (elmo-network-session-process-internal session))))
+         (elmo-network-close-session session)))))
        
 
 (require 'product)