Synch up with main trunk, and prepare the release 2.12.0.

[elisp/wanderlust.git] / wl / wl-util.el

diff --git a/wl/wl-util.el b/wl/wl-util.el
index c486788..a1820d4 100644 (file)
--- a/wl/wl-util.el
+++ b/wl/wl-util.el
@@ -536,9 +536,11 @@ that `read' can handle, whenever this is possible."
     (with-current-buffer wl-current-summary-buffer
       (or wl-message-buffer
          (and (wl-summary-message-number)
-              (car (wl-message-buffer-display wl-summary-buffer-elmo-folder
-                                              (wl-summary-message-number)
-                                              'mime)))))))
+              (car (wl-message-buffer-display
+                    wl-summary-buffer-elmo-folder
+                    (wl-summary-message-number)
+                    wl-summary-buffer-display-mime-mode
+                    nil nil)))))))
 
 (defmacro wl-kill-buffers (regexp)
   (` (mapcar (function
@@ -576,6 +578,16 @@ that `read' can handle, whenever this is possible."
      (buffer-list))
     result))
 
+(defun wl-save-drafts ()
+  (let ((msg (current-message))
+       (buffers (wl-collect-draft)))
+    (save-excursion
+      (while buffers
+       (set-buffer (car buffers))
+       (if (buffer-modified-p) (wl-draft-save))
+       (setq buffers (cdr buffers))))
+    (message msg)))
+
 (static-if (fboundp 'read-directory-name)
     (defun wl-read-directory-name (prompt dir)
       (read-directory-name prompt dir dir))
@@ -705,6 +717,34 @@ that `read' can handle, whenever this is possible."
          (set-window-hscroll (get-buffer-window (current-buffer) t) 0))
        max))))
 
+;; Draft auto-save
+(static-cond
+ (wl-on-xemacs
+  (defvar wl-save-drafts-timer-name "wl-save-drafts")
+
+  (defun wl-set-save-drafts ()
+    (if (numberp wl-auto-save-drafts-interval)
+       (unless (get-itimer wl-save-drafts-timer-name)
+         (start-itimer wl-save-drafts-timer-name 'wl-save-drafts
+                       wl-auto-save-drafts-interval wl-auto-save-drafts-interval
+                       t))
+      (when (get-itimer wl-save-drafts-timer-name)
+       (delete-itimer wl-save-drafts-timer-name)))))
+ (t
+  (defun wl-set-save-drafts ()
+    (if (numberp wl-auto-save-drafts-interval)
+       (progn
+         (require 'timer)
+         (if (get 'wl-save-drafts 'timer)
+             (progn (timer-set-idle-time (get 'wl-save-drafts 'timer)
+                                         wl-auto-save-drafts-interval t)
+                    (timer-activate-when-idle (get 'wl-save-drafts 'timer)))
+           (put 'wl-save-drafts 'timer
+                (run-with-idle-timer
+                 wl-auto-save-drafts-interval t 'wl-save-drafts))))
+      (when (get 'wl-save-drafts 'timer)
+       (cancel-timer (get 'wl-save-drafts 'timer)))))))
+
 ;; Biff
 (static-cond
  (wl-on-xemacs
@@ -721,9 +761,7 @@ that `read' can handle, whenever this is possible."
                    wl-biff-check-interval wl-biff-check-interval
                    wl-biff-use-idle-timer))))
 
- ((and (condition-case nil (require 'timer) (error nil));; FSFmacs 19+
-       (fboundp 'timer-activate))
-
+ (t
   (defun wl-biff-stop ()
     (when (get 'wl-biff 'timer)
       (cancel-timer (get 'wl-biff 'timer))))
@@ -809,10 +847,7 @@ This function is imported from Emacs 20.7."
            (timer-set-time timer (timer-next-integral-multiple-of-time
                                   current wl-biff-check-interval)
                            wl-biff-check-interval)
-           (timer-activate timer))))))
- (t
-  (fset 'wl-biff-stop 'ignore)
-  (fset 'wl-biff-start 'ignore)))
+           (timer-activate timer)))))))
 
 (defsubst wl-biff-notify (new-mails notify-minibuf)
   (when (and (not wl-modeline-biff-status) (> new-mails 0))
@@ -847,7 +882,8 @@ This function is imported from Emacs 20.7."
            (while flist
              (setq folder (wl-folder-get-elmo-folder (car flist))
                    flist (cdr flist))
-             (when (elmo-folder-plugged-p folder)
+             (when (and (elmo-folder-plugged-p folder)
+                        (elmo-folder-exists-p folder))
                (setq new-mails
                      (+ new-mails
                         (nth 0 (wl-biff-check-folder folder))))))
@@ -877,23 +913,26 @@ This function is imported from Emacs 20.7."
   (wl-biff-notify (car diff) (nth 2 data)))
 
 (defun wl-biff-check-folder-async (folder notify-minibuf)
-  (when (elmo-folder-plugged-p folder)
-    (elmo-folder-set-biff-internal folder t)
-    (if (and (eq (elmo-folder-type-internal folder) 'imap4)
-            (elmo-folder-use-flag-p folder))
-       ;; Check asynchronously only when IMAP4 and use server diff.
-       (progn
-         (setq elmo-folder-diff-async-callback
-               'wl-biff-check-folder-async-callback)
-         (setq elmo-folder-diff-async-callback-data
-               (list (elmo-folder-name-internal folder)
-                     (get-buffer wl-folder-buffer-name)
-                     notify-minibuf))
-         (elmo-folder-diff-async folder))
-      (unwind-protect
-         (wl-biff-notify (car (wl-biff-check-folder folder))
-                         notify-minibuf)
-       (setq wl-biff-check-folders-running nil)))))
+  (if (and (elmo-folder-plugged-p folder)
+          (wl-folder-entity-exists-p (elmo-folder-name-internal folder)))
+      (progn
+       (elmo-folder-set-biff-internal folder t)
+       (if (and (eq (elmo-folder-type-internal folder) 'imap4)
+                (elmo-folder-use-flag-p folder))
+           ;; Check asynchronously only when IMAP4 and use server diff.
+           (progn
+             (setq elmo-folder-diff-async-callback
+                   'wl-biff-check-folder-async-callback)
+             (setq elmo-folder-diff-async-callback-data
+                   (list (elmo-folder-name-internal folder)
+                         (get-buffer wl-folder-buffer-name)
+                         notify-minibuf))
+             (elmo-folder-diff-async folder))
+         (unwind-protect
+             (wl-biff-notify (car (wl-biff-check-folder folder))
+                             notify-minibuf)
+           (setq wl-biff-check-folders-running nil))))
+    (setq wl-biff-check-folders-running nil)))
 
 (if (and (fboundp 'regexp-opt)
         (not (featurep 'xemacs)))