projects
/
elisp
/
wanderlust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* wl-folder.el (wl-folder-open-close): Keep cursor on the line
[elisp/wanderlust.git]
/
wl
/
wl-spam.el
diff --git
a/wl/wl-spam.el
b/wl/wl-spam.el
index
1a7fee4
..
ad1febc
100644
(file)
--- a/
wl/wl-spam.el
+++ b/
wl/wl-spam.el
@@
-41,7
+41,7
@@
"Spam configuration for wanderlust."
:group 'wl)
"Spam configuration for wanderlust."
:group 'wl)
-(defcustom wl-spam-folder-name "+spam"
+(defcustom wl-spam-folder "+spam"
"*Spam folder."
:type 'string
:group 'wl-spam)
"*Spam folder."
:type 'string
:group 'wl-spam)
@@
-103,7
+103,7
@@
See `wl-summary-mark-action-list' for the detail of element."
:group 'wl-spam)
(defun wl-spam-domain (folder-name)
:group 'wl-spam)
(defun wl-spam-domain (folder-name)
- (cond ((string= folder-name wl-spam-folder-name)
+ (cond ((string= folder-name wl-spam-folder)
'spam)
((wl-string-match-member folder-name
wl-spam-undecided-folder-regexp-list)
'spam)
((wl-string-match-member folder-name
wl-spam-undecided-folder-regexp-list)
@@
-263,6
+263,7
@@
See `wl-summary-mark-action-list' for the detail of element."
(let ((domain (wl-spam-domain (elmo-folder-name-internal
wl-summary-buffer-elmo-folder)))
(total (length mark-list)))
(let ((domain (wl-spam-domain (elmo-folder-name-internal
wl-summary-buffer-elmo-folder)))
(total (length mark-list)))
+ (wl-folder-confirm-existence (elmo-make-folder wl-spam-folder))
(when (memq domain '(undecided good))
(message "Registering spam...")
(elmo-with-progress-display (> total elmo-display-progress-threshold)
(when (memq domain '(undecided good))
(message "Registering spam...")
(elmo-with-progress-display (> total elmo-display-progress-threshold)
@@
-273,7
+274,7
@@
See `wl-summary-mark-action-list' for the detail of element."
(eq domain 'good)))
(message "Registering spam...done"))
(wl-summary-move-mark-list-messages mark-list
(eq domain 'good)))
(message "Registering spam...done"))
(wl-summary-move-mark-list-messages mark-list
- wl-spam-folder-name
+ wl-spam-folder
"Refiling spam...")))
(defun wl-summary-exec-action-refile-with-register (mark-list)
"Refiling spam...")))
(defun wl-summary-exec-action-refile-with-register (mark-list)
@@
-292,17
+293,22
@@
See `wl-summary-mark-action-list' for the detail of element."
(spam (setq spam-list nil))
(good (setq good-list nil)))
(when (or spam-list good-list)
(spam (setq spam-list nil))
(good (setq good-list nil)))
(when (or spam-list good-list)
- (message "Registering spam...")
- (setq total (+ (length spam-list) (length good-list)))
- (elmo-with-progress-display (> total elmo-display-progress-threshold)
- (elmo-spam-register total "Registering spam...")
- (when spam-list
+ (when spam-list
+ (setq total (length spam-list))
+ (message "Registering spam...")
+ (elmo-with-progress-display (> total elmo-display-progress-threshold)
+ (elmo-spam-register total "Registering spam...")
(elmo-spam-register-spam-messages processor folder spam-list
(eq domain 'good)))
(elmo-spam-register-spam-messages processor folder spam-list
(eq domain 'good)))
- (when good-list
+ (message "Registering spam...done"))
+ (when good-list
+ (setq total (length good-list))
+ (message "Registering good...")
+ (elmo-with-progress-display (> total elmo-display-progress-threshold)
+ (elmo-spam-register total "Registering good...")
(elmo-spam-register-good-messages processor folder good-list
(elmo-spam-register-good-messages processor folder good-list
- (eq domain 'spam))))
- (message "Registering spam...done")))
+ (eq domain 'spam)))
+ (message "Registering good...done"))))
;; execute refile messages
(wl-summary-exec-action-refile mark-list)))
;; execute refile messages
(wl-summary-exec-action-refile mark-list)))
@@
-311,18
+317,17
@@
See `wl-summary-mark-action-list' for the detail of element."
(number wl-message-buffer-cur-number)
spam)
(message "Cheking spam...")
(number wl-message-buffer-cur-number)
spam)
(message "Cheking spam...")
- (when (elmo-spam-buffer-spam-p (elmo-spam-processor) original)
+ (when (setq spam (elmo-spam-buffer-spam-p (elmo-spam-processor) original))
(with-current-buffer wl-message-buffer-cur-summary-buffer
(wl-summary-spam number)))
(message "Cheking spam...done")
(with-current-buffer wl-message-buffer-cur-summary-buffer
(wl-summary-spam number)))
(message "Cheking spam...done")
- (when (interactive-p)
- (message "No: %d is %sa spam message." number (if spam "" "not ")))))
+ (message "No: %d is %sa spam message." number (if spam "" "not "))))
(defun wl-refile-guess-by-spam (entity)
(when (elmo-spam-message-spam-p (elmo-spam-processor)
wl-summary-buffer-elmo-folder
(elmo-message-entity-number entity))
(defun wl-refile-guess-by-spam (entity)
(when (elmo-spam-message-spam-p (elmo-spam-processor)
wl-summary-buffer-elmo-folder
(elmo-message-entity-number entity))
- wl-spam-folder-name))
+ wl-spam-folder))
(defun wl-spam-setup ()
(add-hook 'wl-summary-prepared-hook #'wl-summary-auto-check-spam)
(defun wl-spam-setup ()
(add-hook 'wl-summary-prepared-hook #'wl-summary-auto-check-spam)
@@
-347,6
+352,8
@@
See `wl-summary-mark-action-list' for the detail of element."
wl-summary-skip-mark-list))))
(define-key wl-summary-mode-map "k" wl-summary-spam-map)
(define-key
wl-summary-skip-mark-list))))
(define-key wl-summary-mode-map "k" wl-summary-spam-map)
(define-key
+ wl-summary-mode-map "mk" 'wl-summary-target-mark-spam)
+ (define-key
wl-summary-mode-map "ms" 'wl-summary-target-mark-register-as-spam)
(define-key
wl-summary-mode-map "mn" 'wl-summary-target-mark-register-as-good))
wl-summary-mode-map "ms" 'wl-summary-target-mark-register-as-spam)
(define-key
wl-summary-mode-map "mn" 'wl-summary-target-mark-register-as-good))