From 3df84e903fab763633308ebaad2d981ecd75101f Mon Sep 17 00:00:00 2001 From: teranisi Date: Fri, 20 Sep 2002 10:20:43 +0000 Subject: [PATCH] * wl-summary.el (wl-summary-buffer-mark-modified): Abolish (All other related portions are changed). (wl-summary-mark-as-read-all): Rewrite. --- wl/ChangeLog | 6 ++++++ wl/wl-summary.el | 39 ++++++++++----------------------------- 2 files changed, 16 insertions(+), 29 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index 0d212fa..1043bbb 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,9 @@ +2002-09-20 Yuuichi Teranishi + + * wl-summary.el (wl-summary-buffer-mark-modified): Abolish + (All other related portions are changed). + (wl-summary-mark-as-read-all): Rewrite. + 2002-09-19 Yuuichi Teranishi * wl-summary.el (wl-summary-sync-marks): Set no-modeline argument of diff --git a/wl/wl-summary.el b/wl/wl-summary.el index d2d0e25..8f46ff5 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -89,7 +89,6 @@ (defvar wl-summary-buffer-thread-indent-set-alist nil) (defvar wl-summary-buffer-view nil) (defvar wl-summary-buffer-message-modified nil) -(defvar wl-summary-buffer-mark-modified nil) (defvar wl-summary-buffer-thread-modified nil) (defvar wl-summary-buffer-number-column nil) @@ -154,7 +153,6 @@ (make-variable-buffer-local 'wl-summary-buffer-thread-indent-set) (make-variable-buffer-local 'wl-summary-buffer-view) (make-variable-buffer-local 'wl-summary-buffer-message-modified) -(make-variable-buffer-local 'wl-summary-buffer-mark-modified) (make-variable-buffer-local 'wl-summary-buffer-thread-modified) (make-variable-buffer-local 'wl-summary-buffer-number-column) (make-variable-buffer-local 'wl-summary-buffer-temp-mark-column) @@ -1060,10 +1058,10 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'." wl-summary-buffer-message-modified) (defun wl-summary-set-mark-modified () (elmo-folder-set-mark-modified-internal - wl-summary-buffer-elmo-folder t) - (setq wl-summary-buffer-mark-modified t)) + wl-summary-buffer-elmo-folder t)) (defun wl-summary-mark-modified-p () - wl-summary-buffer-mark-modified) + (elmo-folder-mark-modified-internal + wl-summary-buffer-elmo-folder)) (defun wl-summary-set-thread-modified () (setq wl-summary-buffer-thread-modified t)) (defun wl-summary-thread-modified-p () @@ -1201,7 +1199,6 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'." (wl-summary-cleanup-temp-marks) (erase-buffer) (wl-summary-set-message-modified) - (wl-summary-set-mark-modified) (setq wl-thread-entity-hashtb (elmo-make-hash (* (length (elmo-msgdb-get-number-alist (wl-summary-buffer-msgdb))) 2))) @@ -1660,25 +1657,16 @@ If ARG is non-nil, checking is omitted." (save-excursion (goto-char (point-min)) (while (not (eobp)) - (setq msg (wl-summary-message-number)) - (setq mark (wl-summary-persistent-mark)) - (when (and (not (string= mark " ")) - (not (string= mark elmo-msgdb-important-mark)) - (not (string= mark elmo-msgdb-read-uncached-mark))) + (setq msg (wl-summary-message-number) + mark (wl-summary-persistent-mark) + new-mark (or (elmo-message-mark folder msg) " ")) + (unless (string= mark new-mark) (delete-backward-char 1) - (if (or (not (elmo-message-use-cache-p folder msg)) - (string= mark elmo-msgdb-unread-cached-mark)) - (progn - (insert " ") - (elmo-msgdb-set-mark msgdb msg nil)) - ;; New mark and unread-uncached mark - (insert elmo-msgdb-read-uncached-mark) - (elmo-msgdb-set-mark - msgdb msg elmo-msgdb-read-uncached-mark)) + ;; New mark and unread-uncached mark + (insert new-mark) (if wl-summary-highlight (wl-highlight-summary-current-line nil nil t))) (forward-line 1))) - (wl-summary-set-mark-modified) (wl-folder-update-unread (wl-summary-buffer-folder-name) 0) (setq wl-summary-buffer-unread-count 0) (setq wl-summary-buffer-new-count 0) @@ -1709,8 +1697,6 @@ If ARG is non-nil, checking is omitted." (elmo-message-field wl-summary-buffer-elmo-folder number 'message-id))) - ;; (elmo-msgdb-set-mark msgdb number new-mark) - ;; (wl-summary-set-mark-modified) (if wl-summary-highlight (wl-highlight-summary-current-line nil nil t)) (set-buffer-modified-p nil))))) @@ -2020,7 +2006,6 @@ If ARG is non-nil, checking is omitted." "Making thread...done" "Inserting message...done"))) (wl-summary-set-message-modified) - (wl-summary-set-mark-modified) (when (and sync-all (eq wl-summary-buffer-view 'thread)) (elmo-kill-buffer wl-summary-search-buf-name) (message "Inserting message...") @@ -2175,7 +2160,6 @@ If ARG is non-nil, checking is omitted." dels) ;;; (elmo-msgdb-save (wl-summary-buffer-folder-name) nil) (wl-summary-set-message-modified) - (wl-summary-set-mark-modified) (wl-folder-set-folder-updated (wl-summary-buffer-folder-name) (list 0 0 0)) ;;; for thread. @@ -2286,7 +2270,6 @@ If ARG, without confirm." wl-summary-buffer-temp-mark-column wl-summary-buffer-persistent-mark-column wl-summary-buffer-message-modified - wl-summary-buffer-mark-modified wl-summary-buffer-thread-modified wl-summary-buffer-number-list wl-summary-buffer-msgdb @@ -3042,7 +3025,6 @@ If optional argument NUMBER is specified, mark message specified by NUMBER." ;; end cOpy (wl-summary-folder-info-update) (wl-summary-set-message-modified) - (wl-summary-set-mark-modified) (run-hooks 'wl-summary-exec-hook) (unless (and wl-message-buffer (eq (wl-summary-message-number) @@ -3986,8 +3968,7 @@ If ARG, exit virtual folder." (elmo-message-encache folder number 'read)) (unless no-server-update (elmo-msgdb-global-mark-set message-id - elmo-msgdb-important-mark))) - (wl-summary-set-mark-modified))) + elmo-msgdb-important-mark))))) (if (and visible wl-summary-highlight) (wl-highlight-summary-current-line nil nil t)))) (set-buffer-modified-p nil) -- 1.7.10.4