X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=wl%2Fwl.el;h=a8d1916cb092337dab7c05f840e16a31dade96dd;hb=17d892dc665511c9c8fe2c9cd16a7d1c1d087c8c;hp=093a7d4f0aa7b24cf19e163f41b03eb0db631452;hpb=e836f7a8ae2ec8eba7f155a58c5de7252cfc01ab;p=elisp%2Fwanderlust.git diff --git a/wl/wl.el b/wl/wl.el index 093a7d4..a8d1916 100644 --- a/wl/wl.el +++ b/wl/wl.el @@ -56,8 +56,10 @@ (provide 'wl) ; circular dependency (require 'wl-folder) (require 'wl-summary) +(require 'wl-action) (require 'wl-thread) (require 'wl-address) +(require 'wl-news) (wl-draft-mode-setup) (require 'wl-draft) @@ -71,7 +73,8 @@ (require 'smtp) (require 'wl-score) (require 'wl-fldmgr) - (require 'wl-mime)) + (require 'wl-mime) + (require 'wl-spam)) (defun wl-plugged-init (&optional make-alist) (setq elmo-plugged wl-plugged) @@ -109,7 +112,10 @@ (progn ;; flush queue!! (elmo-dop-queue-flush) - (unless queue-flush-only (wl-biff-start)) + (unless queue-flush-only + (when wl-biff-check-folder-list + (wl-biff-check-folders) + (wl-biff-start))) (if (and wl-draft-enable-queuing wl-auto-flush-queue) (wl-draft-queue-flush)) @@ -131,7 +137,8 @@ (defvar wl-plugged-port-label-alist (list (cons 119 "nntp") (cons 143 "imap4") - (cons 110 "pop3"))) + (cons 110 "pop3") + (cons 25 "smtp"))) ;;(cons elmo-pop-before-smtp-port "pop3") (defconst wl-plugged-switch-variables @@ -629,23 +636,33 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'." (wl-save-status 'keep-summary) (run-hooks 'wl-save-hook)) +(defun wl-execute-temp-marks () + "Execute temporary marks in summary buffers." + (interactive) + (let ((summaries (wl-collect-summary))) + (while summaries + (with-current-buffer (car summaries) + (wl-summary-exec-with-confirmation) + (wl-summary-save-status)) + (setq summaries (cdr summaries))))) + (defun wl-save-status (&optional keep-summary) (message "Saving summary and folder status...") - (let (summary-buf) - (save-excursion - (let ((summaries (wl-collect-summary))) - (while summaries - (with-current-buffer (car summaries) - (unless keep-summary - (wl-summary-cleanup-temp-marks)) - (wl-summary-save-view) - (elmo-folder-commit wl-summary-buffer-elmo-folder) - (unless keep-summary - (kill-buffer (car summaries)))) - (setq summaries (cdr summaries)))))) + (save-excursion + (let ((summaries (wl-collect-summary))) + (while summaries + (with-current-buffer (car summaries) + (unless keep-summary + (wl-summary-cleanup-temp-marks)) + (wl-summary-save-view) + (elmo-folder-commit wl-summary-buffer-elmo-folder) + (unless keep-summary + (kill-buffer (car summaries)))) + (setq summaries (cdr summaries))))) (wl-refile-alist-save) (wl-folder-info-save) (and (featurep 'wl-fldmgr) (wl-fldmgr-exit)) + (and (featurep 'wl-spam) (wl-spam-save-status)) (elmo-crosspost-message-alist-save) (message "Saving summary and folder status...done")) @@ -656,6 +673,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'." (elmo-quit) (when wl-use-acap (funcall (symbol-function 'wl-acap-exit))) (wl-biff-stop) + (elmo-clear-signal-slots) (run-hooks 'wl-exit-hook) (wl-save-status) (wl-folder-cleanup-variables) @@ -673,6 +691,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'." ;; (delete-frame)) (setq wl-init nil) (remove-hook 'kill-emacs-hook 'wl-save-status) + (elmo-passwd-alist-clear) t) (message "") ; empty minibuffer. ) @@ -694,8 +713,30 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'." (symbol-value 'wl-summary-subject-function)) (fset 'wl-summary-subject-filter-func-internal (symbol-value 'wl-summary-subject-filter-function)) + (wl-summary-define-sort-command) + (wl-summary-define-mark-action) + (dolist (spec wl-summary-flag-alist) + (set-face-foreground + (make-face (intern + (format "wl-highlight-summary-%s-flag-face" (car spec)))) + (nth 1 spec))) + (setq elmo-get-folder-function #'wl-folder-make-elmo-folder) (setq elmo-no-from wl-summary-no-from-message) (setq elmo-no-subject wl-summary-no-subject-message) + (elmo-global-flags-initialize (mapcar 'car wl-summary-flag-alist)) + (elmo-connect-signal + nil + 'message-number-changed + 'wl-draft + (elmo-define-signal-handler (listener folder old-number new-number) + (dolist (buffer (wl-collect-draft)) + (with-current-buffer buffer + (wl-draft-buffer-change-number old-number new-number))) + (wl-draft-rename-saved-config old-number new-number)) + (elmo-define-signal-filter (listener folder old-number new-number) + (and folder + (string= (elmo-folder-name-internal folder) wl-draft-folder)))) + (wl-news-check) (setq wl-init t) ;; This hook may contain the functions `wl-plugged-init-icons' and ;; `wl-biff-init-icons' for reasons of system internal to accord @@ -703,7 +744,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'." (run-hooks 'wl-init-hook))) (defun wl-check-environment (no-check-folder) - (unless wl-from (elmo-warning "Please set `wl-from'.")) + (unless wl-from (error "Please set `wl-from' to your mail address")) ;; Message-ID (when wl-insert-message-id (let ((message-id (funcall wl-message-id-function)) @@ -711,10 +752,10 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'." (unless (string-match "^<\\([^@]*\\)@\\([^@]*\\)>$" message-id) (cond ((string-match "@" wl-message-id-domain) - (error "Please remove `@' from `wl-message-id-domain'.")) + (error "Please remove `@' from `wl-message-id-domain'")) (t (error - "Check around `wl-message-id-function' to get valid Message-ID string.")))) + "Check around `wl-message-id-function' to get valid Message-ID string")))) (setq domain (match-string 2 message-id)) (if (or (not (string-match "[^.]\\.[^.]" domain)) (string= domain "localhost.localdomain")) @@ -726,8 +767,6 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'." (queue-folder (wl-folder-get-elmo-folder wl-queue-folder)) (lost+found-folder (wl-folder-get-elmo-folder elmo-lost+found-folder))) - (if (not (elmo-folder-message-file-p draft-folder)) - (error "%s is not allowed for draft folder" wl-draft-folder)) (unless (elmo-folder-exists-p draft-folder) (if (y-or-n-p (format "Draft Folder %s does not exist, create it? " @@ -776,7 +815,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'." (defun wl-check-variables-2 () (if (< wl-message-buffer-cache-size 1) - (error "`wl-message-buffer-cache-size' must be larger than 0.")) + (error "`wl-message-buffer-cache-size' must be larger than 0")) (when wl-message-buffer-prefetch-depth (if (not (< wl-message-buffer-prefetch-depth wl-message-buffer-cache-size)) @@ -791,7 +830,6 @@ If ARG (prefix argument) is specified, folder checkings are skipped." (interactive "P") (unless wl-init (wl-load-profile) - (wl-folder-init) (elmo-init)) (let (demo-buf check) (unless wl-init @@ -809,18 +847,20 @@ If ARG (prefix argument) is specified, folder checkings are skipped." (wl-check-variables) (wl-check-variables-2) (message "Checking type of variables...done"))) - (wl-plugged-init (wl-folder arg)) + (let ((inhibit-quit t)) + (wl-plugged-init (wl-folder))) (unless arg (run-hooks 'wl-auto-check-folder-pre-hook) (wl-folder-auto-check) - (run-hooks 'wl-auto-check-folder-hook)) - (unless arg (wl-biff-start))) + (run-hooks 'wl-auto-check-folder-hook))) (error (if (buffer-live-p demo-buf) (kill-buffer demo-buf)) - (setq wl-init nil) (signal (car obj)(cdr obj))) (quit)) + (when wl-biff-check-folder-list + (unless arg (wl-biff-check-folders)) + (wl-biff-start)) (if (buffer-live-p demo-buf) (kill-buffer demo-buf))) (run-hooks 'wl-hook)) @@ -905,7 +945,8 @@ If ARG (prefix argument) is specified, folder checkings are skipped." wl-score-change-score-file wl-score-edit-current-scores wl-score-edit-file wl-score-flush-cache wl-summary-rescore wl-score-set-mark-below wl-score-set-expunge-below - wl-summary-increase-score wl-summary-lower-score )))) + wl-summary-increase-score wl-summary-lower-score ) + ("wl-draft" wl-draft-rename-saved-config)))) ;; for backward compatibility (defalias 'wl-summary-from-func-petname 'wl-summary-default-from)