X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=wl%2Fwl-summary.el;h=d8089b00eba52afec01f4f7c7ec20309b7242c96;hb=4e359c1798c1cb6e355283a1e36a3f1346d5667b;hp=5b3bf6a7f9103d696fde32381a068b8858a74bf2;hpb=6002b1186d8ad1620e58f35e5c5acb77317a136c;p=elisp%2Fwanderlust.git diff --git a/wl/wl-summary.el b/wl/wl-summary.el index 5b3bf6a..d8089b0 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -75,7 +75,7 @@ (defvar wl-summary-buffer-disp-msg nil) (defvar wl-summary-buffer-disp-folder nil) (defvar wl-summary-buffer-temp-mark-list nil) -(defvar wl-summary-buffer-last-displayed-msg nil) +(defvar wl-summary-buffer-message-ring nil) (defvar wl-summary-buffer-current-msg nil) (defvar wl-summary-buffer-unread-count 0) (defvar wl-summary-buffer-new-count 0) @@ -142,7 +142,7 @@ (make-variable-buffer-local 'wl-summary-buffer-disp-folder) (make-variable-buffer-local 'wl-summary-buffer-target-mark-list) (make-variable-buffer-local 'wl-summary-buffer-temp-mark-list) -(make-variable-buffer-local 'wl-summary-buffer-last-displayed-msg) +(make-variable-buffer-local 'wl-summary-buffer-message-ring) (make-variable-buffer-local 'wl-summary-buffer-unread-count) (make-variable-buffer-local 'wl-summary-buffer-new-count) (make-variable-buffer-local 'wl-summary-buffer-answered-count) @@ -581,6 +581,31 @@ See also variable `wl-use-petname'." (not (wl-thread-entity-parent-invisible-p (wl-thread-get-entity number))))) +(defun wl-summary-push-message (number) + (when (and number + (not (equal number (car wl-summary-buffer-message-ring)))) + (setq wl-summary-buffer-message-ring + (cons number wl-summary-buffer-message-ring)) + (when (> (length wl-summary-buffer-message-ring) + wl-summary-message-ring-max) + (setcdr (nthcdr (1- wl-summary-message-ring-max) + wl-summary-buffer-message-ring) + nil)))) + +(defun wl-summary-pop-message (&optional current-number) + (when wl-summary-buffer-message-ring + (when current-number + (setq wl-summary-buffer-message-ring + (nconc wl-summary-buffer-message-ring (list current-number)))) + (prog1 + (car wl-summary-buffer-message-ring) + (setq wl-summary-buffer-message-ring + (cdr wl-summary-buffer-message-ring))))) + +(defmacro wl-summary-message-status (&optional number) + `(elmo-message-status wl-summary-buffer-elmo-folder + (or ,number (wl-summary-message-number)))) + (defun wl-summary-update-mark-and-highlight-window (&optional win beg) "A function to be called as window-scroll-functions." (with-current-buffer (window-buffer win) @@ -588,20 +613,13 @@ See also variable `wl-use-petname'." (let ((beg (or beg (window-start win))) (end (condition-case nil (window-end win t) ; old emacsen doesn't support 2nd arg. - (error (window-end win)))) - number flags) + (error (window-end win))))) (save-excursion (goto-char beg) (while (and (< (point) end) (not (eobp))) (when (or (null (get-text-property (point) 'face)) (wl-summary-persistent-mark-invalid-p)) - (setq number (wl-summary-message-number)) - (when number - (setq flags (elmo-message-flags wl-summary-buffer-elmo-folder - number))) - (let (wl-summary-highlight) - (wl-summary-update-persistent-mark number flags)) - (wl-highlight-summary-current-line number flags)) + (wl-summary-update-persistent-mark (wl-summary-message-number))) (forward-line 1))))) (set-buffer-modified-p nil))) @@ -670,10 +688,10 @@ See also variable `wl-use-petname'." (wl-summary-update-persistent-mark-on-event buffer numbers))) (elmo-connect-signal wl-summary-buffer-elmo-folder - 'cache-changed + 'status-changed (current-buffer) - (elmo-define-signal-handler (buffer folder number) - (wl-summary-update-persistent-mark-on-event buffer (list number)))) + (elmo-define-signal-handler (buffer folder numbers) + (wl-summary-update-persistent-mark-on-event buffer numbers))) (elmo-connect-signal wl-summary-buffer-elmo-folder 'update-overview @@ -686,7 +704,7 @@ See also variable `wl-use-petname'." (when (and (eq major-mode 'wl-summary-mode) wl-summary-buffer-elmo-folder) (elmo-disconnect-signal 'flag-changed (current-buffer)) - (elmo-disconnect-signal 'cache-changed (current-buffer)) + (elmo-disconnect-signal 'status-changed (current-buffer)) (elmo-disconnect-signal 'update-overview (current-buffer)))) (defun wl-status-update () @@ -798,11 +816,12 @@ you." (defun wl-summary-detect-mark-position () (let ((column wl-summary-buffer-number-column) (formatter wl-summary-buffer-line-formatter) + (lang wl-summary-buffer-weekday-name-lang) + (dummy-number 10000) (dummy-temp (char-to-string 200)) ;; bind only for the check. (wl-summary-new-uncached-mark (char-to-string 201)) (wl-summary-persistent-mark-priority-list '(new)) ; ditto. - (lang wl-summary-buffer-weekday-name-lang) wl-summary-highlight temp persistent) (with-temp-buffer @@ -813,14 +832,16 @@ you." (wl-summary-create-line (elmo-msgdb-make-message-entity (luna-make-entity 'modb-entity-handler) - :number 10000 + :number dummy-number :from "foo" :subject "bar" :size 100) nil dummy-temp - '(new) - nil)) + (let ((status (elmo-message-status nil dummy-number))) + (elmo-message-status-set-flags status '(new)) + (elmo-message-status-set-killed status nil) + status))) (goto-char (point-min)) (setq temp (save-excursion (when (search-forward dummy-temp nil t) @@ -973,41 +994,16 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'." (defun wl-summary-get-list-info (entity) "Returns (\"ML-name\" . ML-count) of ENTITY." (or (elmo-message-entity-field entity 'ml-info) - (let (sequence ml-name ml-count subject - return-path delivered-to mailing-list) - (setq sequence (elmo-message-entity-field entity 'x-sequence) - ml-name (or (elmo-message-entity-field entity 'x-ml-name) - (and sequence - (car (split-string sequence " ")))) - ml-count (or (elmo-message-entity-field entity 'x-mail-count) - (elmo-message-entity-field entity 'x-ml-count) - (and sequence - (cadr (split-string sequence " "))))) - (and (setq subject (elmo-message-entity-field entity 'subject)) - (setq subject (elmo-delete-char ?\n subject)) - (string-match "^\\s(\\(\\S)+\\)[ :]\\([0-9]+\\)\\s)[ \t]*" - subject) - (progn - (or ml-name (setq ml-name (match-string 1 subject))) - (or ml-count (setq ml-count (match-string 2 subject))))) - (and (setq return-path - (elmo-message-entity-field entity 'return-path)) - (string-match "^<\\([^@>]+\\)-return-\\([0-9]+\\)-" return-path) - (progn - (or ml-name (setq ml-name (match-string 1 return-path))) - (or ml-count (setq ml-count (match-string 2 return-path))))) - (and (setq delivered-to - (elmo-message-entity-field entity 'delivered-to)) - (string-match "^mailing list \\([^@]+\\)@" delivered-to) - (or ml-name (setq ml-name (match-string 1 delivered-to)))) - (and (setq mailing-list - (elmo-message-entity-field entity 'mailing-list)) - ;; *-help@, *-owner@, etc. - (string-match "\\(^\\|; \\)contact \\([^@]+\\)-[^-@]+@" - mailing-list) - (or ml-name (setq ml-name (match-string 2 mailing-list)))) - (cons (and ml-name (car (split-string ml-name " "))) - (and ml-count (string-to-int ml-count)))))) + (lexical-let ((entity entity)) + (let* ((getter (lambda (field) + (elmo-message-entity-field entity field))) + (name (elmo-find-list-match-value + elmo-mailing-list-name-spec-list + getter)) + (count (elmo-find-list-match-value + elmo-mailing-list-count-spec-list + getter))) + (cons name (and count (string-to-int count))))))) (defun wl-summary-overview-entity-compare-by-list-info (x y) "Compare entity X and Y by mailing-list info." @@ -1021,30 +1017,19 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'." (string< (or (car list-info-x) "") (or (car list-info-y) ""))))) -(defun wl-summary-sort-by-date (reverse) - "Sort summary lines into the order by message date; argument means descending order." - (interactive "P") - (wl-summary-rescan "date" reverse)) -(defun wl-summary-sort-by-number (reverse) - "Sort summary lines into the order by message number; argument means descending order." - (interactive "P") - (wl-summary-rescan "number" reverse)) -(defun wl-summary-sort-by-subject (reverse) - "Sort summary lines into the order by subject; argument means descending order." - (interactive "P") - (wl-summary-rescan "subject" reverse)) -(defun wl-summary-sort-by-from (reverse) - "Sort summary lines into the order by from; argument means descending order." - (interactive "P") - (wl-summary-rescan "from" reverse)) -(defun wl-summary-sort-by-list-info (reverse) - "Sort summary lines into the order by mailing list info; argument means descending order." - (interactive "P") - (wl-summary-rescan "list-info" reverse)) -(defun wl-summary-sort-by-size (reverse) - "Sort summary lines into the order by message size; argument means descending order." - (interactive "P") - (wl-summary-rescan "size" reverse)) +(defun wl-summary-define-sort-command () + "Define functions to sort summary lines by `wl-summary-sort-specs'." + (interactive) + (dolist (sort-by wl-summary-sort-specs) + (fset (intern (format "wl-summary-sort-by-%s" sort-by)) + `(lambda (&optional reverse) + ,(format "\ +Sort summary lines into the order by %s. +If optional argument REVERSE is non-nil, sort into descending order. + +This function is defined by `wl-summary-define-sort-command'." sort-by) + (interactive "P") + (wl-summary-rescan ,(symbol-name sort-by) reverse))))) (defun wl-summary-sort-function-from-spec (spec reverse) (let (funtion) @@ -1095,7 +1080,6 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'." (and disable-thread wl-summary-search-parent-by-subject-regexp)) (wl-summary-divide-thread-when-subject-changed (and disable-thread wl-summary-divide-thread-when-subject-changed)) - (i 0) num expunged) (erase-buffer) @@ -1116,20 +1100,14 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'." wl-summary-buffer-temp-mark-list nil wl-summary-delayed-update nil) (elmo-kill-buffer wl-summary-search-buf-name) - (while numbers - (wl-summary-insert-message (elmo-message-entity - wl-summary-buffer-elmo-folder - (car numbers)) - wl-summary-buffer-elmo-folder - nil) - (setq numbers (cdr numbers)) - (when (> num elmo-display-progress-threshold) - (setq i (+ i 1)) - (if (or (zerop (% i 5)) (= i num)) - (elmo-display-progress - 'wl-summary-rescan "Constructing summary structure..." - (/ (* i 100) num))))) - (when wl-summary-delayed-update + (elmo-with-progress-display (wl-summary-insert-line num) + "Constructing summary structure" + (dolist (number numbers) + (wl-summary-insert-message (elmo-message-entity + wl-summary-buffer-elmo-folder + number) + wl-summary-buffer-elmo-folder + nil)) (while wl-summary-delayed-update (message "Parent (%d) of message %d is no entity" (caar wl-summary-delayed-update) @@ -1139,12 +1117,8 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'." (cdar wl-summary-delayed-update) wl-summary-buffer-elmo-folder nil t) (setq wl-summary-delayed-update (cdr wl-summary-delayed-update)))) - (message "Constructing summary structure...done") - (if (eq wl-summary-buffer-view 'thread) - (progn - (message "Inserting thread...") - (wl-thread-insert-top) - (message "Inserting thread...done"))) + (when (eq wl-summary-buffer-view 'thread) + (wl-thread-insert-top)) (when wl-use-scoring (wl-summary-score-headers (wl-summary-rescore-msgs wl-summary-buffer-number-list) @@ -1199,8 +1173,7 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'." (wl-summary-insert-line (wl-summary-create-line entity nil (wl-summary-temp-mark number) - (elmo-message-flags folder number) - (elmo-message-cached-p folder number))))) + (elmo-message-status folder number))))) (when (and wl-summary-buffer-disp-msg wl-summary-buffer-current-msg) (save-excursion @@ -1276,9 +1249,9 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'." (when wl-summary-buffer-temp-mark-list (wl-summary-exec-with-confirmation (format "Execute marks in %s? (answer \"n\" to discard them) " - (wl-summary-buffer-folder-name))) - (wl-summary-delete-all-temp-marks 'no-msg) - (setq wl-summary-scored nil))) + (wl-summary-buffer-folder-name)))) + (wl-summary-delete-all-temp-marks 'no-msg) + (setq wl-summary-scored nil)) ;; a subroutine for wl-summary-exit/wl-save-status ;; Note that folder is not commited here. @@ -1406,6 +1379,8 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'." (msgdb-dir (elmo-folder-msgdb-path folder)) (range (or force-range (wl-summary-input-range (elmo-folder-name-internal folder))))) + (when (symbolp range) + (setq range (symbol-name range))) (cond ((string-match "rescan" range) (let ((msg (wl-summary-message-number)) (wl-use-scoring (if (string-match "noscore" range) @@ -1565,25 +1540,27 @@ If ARG is non-nil, checking is omitted." "All uncached messages are cached." (interactive) (unless (elmo-folder-local-p wl-summary-buffer-elmo-folder) - (let ((targets (elmo-folder-list-flagged wl-summary-buffer-elmo-folder - 'uncached 'in-msgdb)) - (count 0) - wl-prefetch-confirm - wl-prefetch-threshold - (elmo-inhibit-display-retrieval-progress t) - length msg) + (let* ((targets (elmo-folder-list-flagged wl-summary-buffer-elmo-folder + 'uncached 'in-msgdb)) + (count 0) + wl-prefetch-confirm + wl-prefetch-threshold + (length (length targets)) + msg) (save-excursion - (goto-char (point-min)) - (setq length (length targets)) - (dolist (target targets) - (when (if (not (wl-thread-entity-parent-invisible-p - (wl-thread-get-entity target))) - (progn - (wl-summary-jump-to-msg target) - (wl-summary-prefetch-msg - (wl-summary-message-number))) - (wl-summary-prefetch-msg target)) - (message "Retrieving... %d/%d" (incf count) length))) + (elmo-with-progress-display (wl-summary-prefetch-message length) + "Retrieving" + (goto-char (point-min)) + (dolist (target targets) + (when (if (not (wl-thread-entity-parent-invisible-p + (wl-thread-get-entity target))) + (progn + (wl-summary-jump-to-msg target) + (wl-summary-prefetch-msg + (wl-summary-message-number))) + (wl-summary-prefetch-msg target)) + (incf count)) + (elmo-progress-notify 'wl-summary-prefetch-message))) (message "Retrieved %d/%d message(s)" count length))))) (defun wl-summary-prefetch-msg (number &optional arg) @@ -1668,8 +1645,8 @@ If ARG is non-nil, checking is omitted." (message "Collecting marks...") (goto-char (point-min)) (while (not (eobp)) - (setq mark (wl-summary-persistent-mark) - msg (wl-summary-message-number)) + (setq msg (wl-summary-message-number)) + (setq mark (wl-summary-persistent-mark msg)) (if (or (and (null prefetch-marks) msg (null (elmo-file-cache-exists-p @@ -1793,6 +1770,15 @@ If ARG is non-nil, checking is omitted." (wl-summary-count-unread) (wl-summary-update-modeline)))) +(defun wl-summary-recover-messages-region (beg end) + "Recover killed messages in region." + (interactive "r") + (let ((number-list (wl-summary-number-list-from-region beg end))) + (if (null number-list) + (message "No message.") + (elmo-folder-recover-messages wl-summary-buffer-elmo-folder + number-list)))) + (defun wl-summary-mark-as-read-all () (interactive) (if (or (not (interactive-p)) @@ -1869,16 +1855,13 @@ If ARG is non-nil, checking is omitted." (delete-char 1) ; delete '\n' (setq wl-summary-buffer-number-list (delq (car msgs) wl-summary-buffer-number-list))))) -; (when (> len elmo-display-progress-threshold) -; (setq i (1+ i)) -; (if (or (zerop (% i 5)) (= i len)) -; (elmo-display-progress -; 'wl-summary-delete-messages-on-buffer deleting-info -; (/ (* i 100) len)))) (setq msgs (cdr msgs))) (when (eq wl-summary-buffer-view 'thread) - (wl-thread-update-line-msgs (elmo-uniq-list update-list)) - (wl-thread-cleanup-symbols msgs2)) + (let ((updates (elmo-uniq-list update-list))) + (elmo-with-progress-display (wl-thread-update-line (length updates)) + "Updating deleted thread" + (wl-thread-update-line-msgs updates) + (wl-thread-cleanup-symbols msgs2)))) ;;(message (concat deleting-info "done")) (wl-summary-count-unread) (wl-summary-update-modeline) @@ -1914,18 +1897,17 @@ This function is defined for `window-scroll-functions'" (defun wl-summary-sort (reverse) "Sort summary lines into the selected order; argument means descending order." (interactive "P") - (let ((spec (wl-completing-read-multiple - (format "%s by (%s): " - (if reverse "Reverse sort" "Sort") - (symbol-name wl-summary-default-sort-spec)) - (nconc - (mapcar (lambda (spec) (list (symbol-name spec))) - wl-summary-sort-specs) - (mapcar (lambda (spec) (list (concat "!" (symbol-name spec)))) - wl-summary-sort-specs)) - nil t))) + (let ((default-value (symbol-name wl-summary-default-sort-spec))) (wl-summary-rescan - (if (equal spec '("")) (symbol-name wl-summary-default-sort-spec) spec) + (wl-completing-read-multiple + (format "%s by (%s): " (if reverse "Reverse sort" "Sort") default-value) + (nconc + (mapcar (lambda (spec) (list (symbol-name spec))) + wl-summary-sort-specs) + (mapcar (lambda (spec) (list (concat "!" (symbol-name spec)))) + wl-summary-sort-specs)) + nil t nil nil + default-value) reverse))) (defun wl-summary-get-available-flags (&optional include-specials) @@ -1992,8 +1974,7 @@ This function is defined for `window-scroll-functions'" (not wl-summary-lazy-highlight))) append-list delete-list update-thread update-top-list - num diff entity - (i 0)) + num diff entity) ;; Setup sync-all (if sync-all (wl-summary-sync-all-init)) (setq diff (elmo-list-diff (elmo-folder-list-messages @@ -2015,28 +1996,22 @@ This function is defined for `window-scroll-functions'" (setq num (length append-list)) (setq wl-summary-delayed-update nil) (elmo-kill-buffer wl-summary-search-buf-name) - (dolist (number append-list) - (setq entity (elmo-message-entity folder number)) - (when (setq update-thread - (wl-summary-insert-message - entity folder - (not sync-all))) - (wl-append update-top-list update-thread)) - (if elmo-use-database - (elmo-database-msgid-put - (elmo-message-entity-field entity 'message-id) - (elmo-folder-name-internal folder) - (elmo-message-entity-number entity))) - (when (> num elmo-display-progress-threshold) - (setq i (+ i 1)) - (if (or (zerop (% i 5)) (= i num)) - (elmo-display-progress - 'wl-summary-sync-update - (if (eq wl-summary-buffer-view 'thread) - "Making thread..." - "Inserting message...") - (/ (* i 100) num))))) - (when wl-summary-delayed-update + (elmo-with-progress-display (wl-summary-insert-line num) + (if (eq wl-summary-buffer-view 'thread) + "Making thread" + "Inserting message") + (dolist (number append-list) + (setq entity (elmo-message-entity folder number)) + (when (setq update-thread + (wl-summary-insert-message + entity folder + (not sync-all))) + (wl-append update-top-list update-thread)) + (if elmo-use-database + (elmo-database-msgid-put + (elmo-message-entity-field entity 'message-id) + (elmo-folder-name-internal folder) + (elmo-message-entity-number entity)))) (while wl-summary-delayed-update (message "Parent (%d) of message %d is no entity" (caar wl-summary-delayed-update) @@ -2049,21 +2024,16 @@ This function is defined for `window-scroll-functions'" (not sync-all) t)) (wl-append update-top-list update-thread)) (setq wl-summary-delayed-update - (cdr wl-summary-delayed-update)))) - (when (and (eq wl-summary-buffer-view 'thread) - update-top-list) - (wl-thread-update-indent-string-thread - (elmo-uniq-list update-top-list))) - (message (if (eq wl-summary-buffer-view 'thread) - "Making thread...done" - "Inserting message...done")) + (cdr wl-summary-delayed-update))) + (when (and (eq wl-summary-buffer-view 'thread) + update-top-list) + (wl-thread-update-indent-string-thread + (elmo-uniq-list update-top-list)))) (when (or delete-list append-list) (wl-summary-set-message-modified)) (when (and sync-all (eq wl-summary-buffer-view 'thread)) (elmo-kill-buffer wl-summary-search-buf-name) - (message "Inserting message...") - (wl-thread-insert-top) - (message "Inserting message...done")) + (wl-thread-insert-top)) (if elmo-use-database (elmo-database-close)) (run-hooks 'wl-summary-sync-updated-hook) @@ -2172,21 +2142,13 @@ This function is defined for `window-scroll-functions'" (defun wl-summary-highlight-msgs (msgs) (save-excursion - (let ((len (length msgs)) - i) - (message "Hilighting...") - (setq i 0) + (elmo-with-progress-display (wl-summary-highlight-line (length msgs)) + "Hilighting" (while msgs (if (wl-summary-jump-to-msg (car msgs)) (wl-highlight-summary-current-line)) (setq msgs (cdr msgs)) - (when (> len elmo-display-progress-threshold) - (setq i (+ i 1)) - (if (or (zerop (% i 5)) (= i len)) - (elmo-display-progress - 'wl-summary-highlight-msgs "Highlighting..." - (/ (* i 100) len))))) - (message "Highlighting...done")))) + (elmo-progress-notify 'wl-summary-highlight-line))))) (defun wl-summary-message-number () (save-excursion @@ -2357,9 +2319,13 @@ If ARG, without confirm." (beginning-of-line)))) (defun wl-summary-get-buffer (folder) - (or (and folder - (get-buffer (wl-summary-sticky-buffer-name folder))) - (get-buffer wl-summary-buffer-name))) + (and folder + (or (get-buffer (wl-summary-sticky-buffer-name folder)) + (let ((buffer (get-buffer wl-summary-buffer-name))) + (and buffer + (with-current-buffer buffer + (string= (wl-summary-buffer-folder-name) folder)) + buffer))))) (defun wl-summary-get-buffer-create (name &optional force-sticky) (if force-sticky @@ -2443,7 +2409,7 @@ If ARG, without confirm." 'as-is 'mime)) (setq wl-summary-buffer-disp-msg nil) - (setq wl-summary-buffer-last-displayed-msg nil) + (setq wl-summary-buffer-message-ring nil) (setq wl-summary-buffer-current-msg nil) (setq wl-summary-buffer-persistent-mark-version 0) (let ((inhibit-read-only t) @@ -2633,6 +2599,7 @@ If ARG, without confirm." (save-excursion (beginning-of-line)(point)) (save-excursion (end-of-line)(point)) 'mouse-face nil)) + (elmo-progress-notify 'wl-summary-insert-line) (ignore-errors (run-hooks 'wl-summary-line-inserted-hook))) @@ -2644,12 +2611,7 @@ If ARG, without confirm." (goto-char (point-max)) (wl-summary-insert-line (wl-summary-create-line entity nil nil - (elmo-message-flags - wl-summary-buffer-elmo-folder - number) - (elmo-message-cached-p - wl-summary-buffer-elmo-folder - number))) + (elmo-message-status folder number))) (setq wl-summary-buffer-number-list (wl-append wl-summary-buffer-number-list (list (elmo-message-entity-number entity)))) @@ -2856,8 +2818,7 @@ If ARG, without confirm." entity parent-entity nil - (elmo-message-flags wl-summary-buffer-elmo-folder number) - (elmo-message-cached-p wl-summary-buffer-elmo-folder number) + (wl-summary-message-status number) (wl-thread-maybe-get-children-num number) (wl-thread-make-indent-string thr-entity) (wl-thread-entity-get-linked thr-entity))))))) @@ -2982,60 +2943,60 @@ If ARG, exit virtual folder." (setq wl-summary-buffer-persistent-mark-version (1+ wl-summary-buffer-persistent-mark-version))) -(defsubst wl-summary-persistent-mark-string (folder flags cached) +(defsubst wl-summary-persistent-mark-string (folder status) "Return the persistent mark string. -The mark is decided according to the FOLDER, FLAGS and CACHED." +The mark is decided according to the FOLDER and STATUS." (let ((priorities wl-summary-persistent-mark-priority-list) + (flags (elmo-message-status-flags status)) + (cached (elmo-message-status-cached-p status)) mark) (while (and (null mark) priorities) - (if (and (eq (car priorities) 'flag) - (elmo-get-global-flags flags 'ignore-preserved)) - (let ((specs wl-summary-flag-alist) + (let ((flag (car priorities))) + (cond + ((eq flag 'flag) + (let ((flags (elmo-get-global-flags flags 'ignore-preserved)) + (specs wl-summary-flag-alist) spec) - (while (setq spec (car specs)) - (if (memq (car spec) flags) - (setq mark (or (nth 2 spec) wl-summary-flag-mark) - specs nil) - (setq specs (cdr specs)))) - (unless mark - (setq mark wl-summary-flag-mark))) - (when (memq (car priorities) flags) + (when flags + (while (setq spec (car specs)) + (if (memq (car spec) flags) + (setq mark (or (nth 2 spec) wl-summary-flag-mark) + specs nil) + (setq specs (cdr specs)))) + (unless mark + (setq mark wl-summary-flag-mark))))) + ((eq flag 'killed) + (when (elmo-message-status-killed-p status) + (setq mark wl-summary-killed-mark))) + ((memq flag flags) (setq mark - (let ((var - (intern - (if cached + (let ((var (intern-soft (format - "wl-summary-%s-cached-mark" (car priorities)) - (format - "wl-summary-%s-uncached-mark" (car priorities)))))) - (if (and (boundp var) - (symbol-value var)) - (symbol-value var) - (if cached - (downcase (substring (symbol-name (car priorities)) - 0 1)) - (upcase (substring (symbol-name (car priorities)) - 0 1)))))))) - (setq priorities (cdr priorities))) + (if cached + "wl-summary-%s-cached-mark" + "wl-summary-%s-uncached-mark") + flag)))) + (or (and var (boundp var) (symbol-value var)) + (funcall (if cached #'downcase #'upcase) + (substring (symbol-name flag) 0 1))))))) + (setq priorities (cdr priorities)))) (or mark (if (or cached (elmo-folder-local-p folder)) nil wl-summary-uncached-mark)))) -(defsubst wl-summary-message-mark (folder number &optional flags) +(defsubst wl-summary-message-mark (folder number &optional status) "Return mark of the message." (ignore-errors (wl-summary-persistent-mark-string folder - (or flags (setq flags (elmo-message-flags folder number))) - (memq 'cached flags) ; XXX for speed-up. - ))) + (or status (elmo-message-status folder number))))) -(defsubst wl-summary-persistent-mark (&optional number flags) +(defsubst wl-summary-persistent-mark (&optional number status) "Return persistent-mark string of current line." (or (wl-summary-message-mark wl-summary-buffer-elmo-folder (or number (wl-summary-message-number)) - flags) + status) " ")) (defun wl-summary-put-temp-mark (mark) @@ -3132,6 +3093,19 @@ The mark is decided according to the FOLDER, FLAGS and CACHED." (wl-summary-count-unread) (wl-summary-update-modeline)))) +(defun wl-summary-target-mark-recover () + "Recover killed messages which have target mark." + (interactive) + (wl-summary-check-target-mark) + (save-excursion + (let ((inhibit-read-only t) + (buffer-read-only nil) + wl-summary-buffer-disp-msg) + (elmo-folder-recover-messages wl-summary-buffer-elmo-folder + wl-summary-buffer-target-mark-list) + (dolist (number wl-summary-buffer-target-mark-list) + (wl-summary-unset-mark number))))) + (defun wl-summary-target-mark-save () (interactive) (wl-summary-check-target-mark) @@ -3151,29 +3125,30 @@ The mark is decided according to the FOLDER, FLAGS and CACHED." (wl-summary-check-target-mark) (wl-summary-pick wl-summary-buffer-target-mark-list 'delete)) -(defun wl-summary-update-persistent-mark (&optional number flags) +(defun wl-summary-update-persistent-mark (&optional number) "Synch up persistent mark of current line with msgdb's. Return non-nil if the mark is updated" (interactive) - (prog1 - (when wl-summary-buffer-persistent-mark-column - (save-excursion - (move-to-column wl-summary-buffer-persistent-mark-column) - (let ((inhibit-read-only t) - (buffer-read-only nil) - (mark (buffer-substring (- (point) 1) (point))) - (new-mark (wl-summary-persistent-mark number flags))) - (prog1 - (unless (string= new-mark mark) - (delete-backward-char 1) - (insert new-mark) - (wl-summary-set-message-modified) - t) - (wl-summary-validate-persistent-mark (point-at-bol) - (point-at-eol)))))) - (when wl-summary-highlight - (wl-highlight-summary-current-line)) - (set-buffer-modified-p nil))) + (let ((status (wl-summary-message-status number))) + (prog1 + (when wl-summary-buffer-persistent-mark-column + (save-excursion + (move-to-column wl-summary-buffer-persistent-mark-column) + (let ((inhibit-read-only t) + (buffer-read-only nil) + (mark (buffer-substring (- (point) 1) (point))) + (new-mark (wl-summary-persistent-mark number status))) + (prog1 + (unless (string= new-mark mark) + (delete-backward-char 1) + (insert new-mark) + (wl-summary-set-message-modified) + t) + (wl-summary-validate-persistent-mark (point-at-bol) + (point-at-eol)))))) + (when wl-summary-highlight + (wl-highlight-summary-current-line number status)) + (set-buffer-modified-p nil)))) (defsubst wl-summary-mark-as-read-internal (inverse number-or-numbers @@ -3438,6 +3413,14 @@ Return non-nil if the mark is updated" 'important nil nil nil (interactive-p)))) +(defun wl-summary-recover-message (number) + "Recover current message if it is killed." + (interactive (list (wl-summary-message-number))) + (if (null number) + (message "No message.") + (elmo-folder-recover-messages wl-summary-buffer-elmo-folder + (list number)))) + ;;; Summary line. (defvar wl-summary-line-formatter nil) @@ -3562,8 +3545,7 @@ Return non-nil if the mark is updated" (defun wl-summary-create-line (wl-message-entity wl-parent-message-entity wl-temp-mark - wl-flags - wl-cached + wl-status &optional wl-thr-children-number wl-thr-indent-string @@ -3572,8 +3554,7 @@ Return non-nil if the mark is updated" (let ((wl-mime-charset wl-summary-buffer-mime-charset) (wl-persistent-mark (wl-summary-persistent-mark-string wl-summary-buffer-elmo-folder - wl-flags - wl-cached)) + wl-status)) (elmo-mime-charset wl-summary-buffer-mime-charset) (elmo-lang wl-summary-buffer-weekday-name-lang) (wl-datevec (or (elmo-time-to-datevec @@ -3604,7 +3585,7 @@ Return non-nil if the mark is updated" (wl-highlight-summary-line-string (elmo-message-entity-number wl-message-entity) line - wl-flags + wl-status wl-temp-mark wl-thr-indent-string)) line)) @@ -4261,11 +4242,10 @@ Reply to author if invoked with ARG." (with-current-buffer summary-buf (run-hooks 'wl-summary-reply-hook)) t))) -(defun wl-summary-write () +(defun wl-summary-write (folder) "Write a new draft from Summary." - (interactive) - (wl-draft (list (cons 'To "")) - nil nil nil nil (wl-summary-buffer-folder-name)) + (interactive (list (wl-summary-buffer-folder-name))) + (wl-draft (list (cons 'To "")) nil nil nil nil folder) (run-hooks 'wl-mail-setup-hook) (mail-position-on-field "To")) @@ -4277,12 +4257,10 @@ Reply to author if invoked with ARG." Call from `wl-summary-write-current-folder'. When guess function return nil, challenge next guess-function.") -(defun wl-summary-write-current-folder (&optional folder) +(defun wl-summary-write-current-folder (folder) "Write message to current FOLDER's newsgroup or mailing-list. Use function list is `wl-summary-write-current-folder-functions'." - (interactive) - ;; default FOLDER is current buffer folder - (setq folder (or folder (wl-summary-buffer-folder-name))) + (interactive (list (wl-summary-buffer-folder-name))) (let ((func-list wl-summary-write-current-folder-functions) guess-list guess-func) (while func-list @@ -4292,7 +4270,7 @@ Use function list is `wl-summary-write-current-folder-functions'." (setq guess-func (car func-list)) (setq func-list nil))) (if (null guess-func) - (wl-summary-write) + (wl-summary-write folder) (unless (or (stringp (nth 0 guess-list)) (stringp (nth 1 guess-list)) (stringp (nth 2 guess-list))) @@ -4487,17 +4465,37 @@ Use function list is `wl-summary-write-current-folder-functions'." "No more unread messages. Type SPC to go to %s." (wl-summary-entity-info-msg next-entity finfo))))))))) -(defun wl-summary-goto-last-displayed-msg () +(defun wl-summary-pop-to-last-message () + "Jump to last displayed message, and pop a new massage off the ring." (interactive) - (unless wl-summary-buffer-last-displayed-msg - (setq wl-summary-buffer-last-displayed-msg - wl-summary-buffer-current-msg)) - (if wl-summary-buffer-last-displayed-msg - (progn - (wl-summary-jump-to-msg wl-summary-buffer-last-displayed-msg) - (if wl-summary-buffer-disp-msg - (wl-summary-redisplay))) - (message "No last message."))) + (let ((number (wl-summary-pop-message (wl-summary-message-number)))) + (unless number + (error "Empty message ring")) + (wl-summary-jump-to-msg number) + (when wl-summary-buffer-disp-msg + (let (wl-summary-buffer-message-ring) + (wl-summary-redisplay))))) + +(defun wl-summary-goto-last-displayed-msg (&optional arg) + "Jump to last displayed message." + (interactive "P") + (cond + ((eq last-command 'wl-summary-pop-to-last-message) + (setq this-command 'wl-summary-pop-to-last-message) + (wl-summary-pop-to-last-message)) + (arg + (setq this-command 'wl-summary-pop-to-last-message) + (wl-summary-pop-to-last-message)) + (t + (let ((current (wl-summary-message-number)) + (number (wl-summary-pop-message))) + (if number + (progn + (wl-summary-jump-to-msg number) + (if wl-summary-buffer-disp-msg + (wl-summary-redisplay) + (wl-summary-push-message current))) + (message "No last message.")))))) (defun wl-summary-message-display-type () (when (and wl-summary-buffer-disp-msg @@ -4605,8 +4603,7 @@ If ARG is numeric number, decode message as following: (if num (progn (setq wl-summary-buffer-disp-msg t) - (setq wl-summary-buffer-last-displayed-msg - wl-summary-buffer-current-msg) + (wl-summary-push-message wl-summary-buffer-current-msg) ;; hide folder window (if (and (not wl-stay-folder-window) (setq fld-buf (get-buffer wl-folder-buffer-name)))